diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 31cf84c7300..a5b7c1c31fe 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -18,6 +18,7 @@
 #include "cpu/m6502/m65c02.h"
 #include "machine/6522via.h"
 #include "machine/bankdev.h"
+#include "machine/input_merger.h"
 #include "machine/mos6551.h"
 #include "machine/msm58321.h"
 #include "machine/ram.h"
@@ -37,20 +38,14 @@ public:
 		m_via0(*this, "via0"),
 		m_rtc(*this, "rtc"),
 		m_centronics(*this, "centronics"),
-		m_ram(*this,"ram"),
+		m_ram(*this, "ram"),
 		m_nvram(*this, "nvram"),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_bank4(*this, "bank4"),
+		m_bankdev(*this, "bank%u", 1U),
 		m_lcd_char_rom(*this, "lcd_char_rom"),
 		m_lcd_scrollx(0),
 		m_lcd_scrolly(0),
 		m_lcd_mode(0),
 		m_lcd_size(0),
-		m_irq_via0(0),
-		m_irq_via1(0),
-		m_irq_acia(0),
 		m_mmu_mode(MMU_MODE_KERN),
 		m_mmu_saved_mode(MMU_MODE_KERN),
 		m_mmu_offset1(0),
@@ -63,14 +58,7 @@ public:
 		m_key_column(0),
 		m_key_shift(0),
 		m_key_force_format(0),
-		m_col0(*this, "COL0"),
-		m_col1(*this, "COL1"),
-		m_col2(*this, "COL2"),
-		m_col3(*this, "COL3"),
-		m_col4(*this, "COL4"),
-		m_col5(*this, "COL5"),
-		m_col6(*this, "COL6"),
-		m_col7(*this, "COL7"),
+		m_col(*this, "COL%u", 0U),
 		m_special(*this, "SPECIAL")
 	{
 	}
@@ -80,8 +68,6 @@ public:
 		m_mmu_mode = MMU_MODE_TEST;
 		update_mmu_mode(MMU_MODE_KERN);
 
-		update_irq();
-
 		save_item(NAME(m_lcd_scrollx));
 		save_item(NAME(m_lcd_scrolly));
 		save_item(NAME(m_lcd_mode));
@@ -200,29 +186,6 @@ public:
 		LCD_SIZE_CHRW = 4
 	};
 
-	void update_irq()
-	{
-		m_maincpu->set_input_line(M65C02_IRQ_LINE, m_irq_via0 | m_irq_via1 | m_irq_acia);
-	}
-
-	WRITE_LINE_MEMBER(write_irq_via0)
-	{
-		m_irq_via0 = state;
-		update_irq();
-	}
-
-	WRITE_LINE_MEMBER(write_irq_via1)
-	{
-		m_irq_via1 = state;
-		update_irq();
-	}
-
-	WRITE_LINE_MEMBER(write_irq_acia)
-	{
-		m_irq_acia = state;
-		update_irq();
-	}
-
 	void update_mmu_mode(int new_mode)
 	{
 		if (m_mmu_mode != new_mode)
@@ -232,10 +195,10 @@ public:
 			switch (m_mmu_mode)
 			{
 			case MMU_MODE_KERN:
-				m_bank1->set_bank(0x04 + 0x00);
+				m_bankdev[0]->set_bank(0x04 + 0x00);
 				update_mmu_offset5();
-				m_bank3->set_bank(0x20 + 0xc0);
-				m_bank4->set_bank(0x30 + 0xc0);
+				m_bankdev[2]->set_bank(0x20 + 0xc0);
+				m_bankdev[3]->set_bank(0x30 + 0xc0);
 				break;
 
 			case MMU_MODE_APPL:
@@ -246,17 +209,17 @@ public:
 				break;
 
 			case MMU_MODE_RAM:
-				m_bank1->set_bank(0x04);
-				m_bank2->set_bank(0x10);
-				m_bank3->set_bank(0x20);
-				m_bank4->set_bank(0x30);
+				m_bankdev[0]->set_bank(0x04);
+				m_bankdev[1]->set_bank(0x10);
+				m_bankdev[2]->set_bank(0x20);
+				m_bankdev[3]->set_bank(0x30);
 				break;
 
 			case MMU_MODE_TEST:
-				m_bank1->set_bank(0x04 + 0x200);
-				m_bank2->set_bank(0x10 + 0x200);
-				m_bank3->set_bank(0x20 + 0x200);
-				m_bank4->set_bank(0x30 + 0x200);
+				m_bankdev[0]->set_bank(0x04 + 0x200);
+				m_bankdev[1]->set_bank(0x10 + 0x200);
+				m_bankdev[2]->set_bank(0x20 + 0x200);
+				m_bankdev[3]->set_bank(0x30 + 0x200);
 				break;
 			}
 		}
@@ -266,7 +229,7 @@ public:
 	{
 		if (m_mmu_mode == MMU_MODE_APPL)
 		{
-			m_bank1->set_bank(0x04 + m_mmu_offset1);
+			m_bankdev[0]->set_bank(0x04 + m_mmu_offset1);
 		}
 	}
 
@@ -274,7 +237,7 @@ public:
 	{
 		if (m_mmu_mode == MMU_MODE_APPL)
 		{
-			m_bank2->set_bank((0x10 + m_mmu_offset2) & 0xff);
+			m_bankdev[1]->set_bank((0x10 + m_mmu_offset2) & 0xff);
 		}
 	}
 
@@ -282,7 +245,7 @@ public:
 	{
 		if (m_mmu_mode == MMU_MODE_APPL)
 		{
-			m_bank3->set_bank((0x20 + m_mmu_offset3) & 0xff);
+			m_bankdev[2]->set_bank((0x20 + m_mmu_offset3) & 0xff);
 		}
 	}
 
@@ -290,7 +253,7 @@ public:
 	{
 		if (m_mmu_mode == MMU_MODE_APPL)
 		{
-			m_bank4->set_bank((0x30 + m_mmu_offset4) & 0xff);
+			m_bankdev[3]->set_bank((0x30 + m_mmu_offset4) & 0xff);
 		}
 	}
 
@@ -298,7 +261,7 @@ public:
 	{
 		if (m_mmu_mode == MMU_MODE_KERN)
 		{
-			m_bank2->set_bank((0x10 + m_mmu_offset5) & 0xff);
+			m_bankdev[1]->set_bank((0x10 + m_mmu_offset5) & 0xff);
 		}
 	}
 
@@ -427,38 +390,6 @@ public:
 		m_key_column = data;
 	}
 
-	int read_column(int column)
-	{
-		switch (column)
-		{
-		case 0:
-			return m_col0->read();
-
-		case 1:
-			return m_col1->read();
-
-		case 2:
-			return m_col2->read();
-
-		case 3:
-			return m_col3->read();
-
-		case 4:
-			return m_col4->read();
-
-		case 5:
-			return m_col5->read();
-
-		case 6:
-			return m_col6->read();
-
-		case 7:
-			return m_col7->read();
-		}
-
-		return 0;
-	}
-
 	WRITE8_MEMBER(via0_pb_w)
 	{
 		write_key_poll((data >> 0) & 1);
@@ -479,7 +410,7 @@ public:
 				{
 					if ((m_key_column & (128 >> i)) == 0)
 					{
-						m_key_shift |= read_column(i) << 8;
+						m_key_shift |= m_col[i]->read() << 8;
 					}
 				}
 
@@ -562,18 +493,12 @@ private:
 	required_device<centronics_device> m_centronics;
 	required_device<ram_device> m_ram;
 	required_device<nvram_device> m_nvram;
-	required_device<address_map_bank_device> m_bank1;
-	required_device<address_map_bank_device> m_bank2;
-	required_device<address_map_bank_device> m_bank3;
-	required_device<address_map_bank_device> m_bank4;
+	required_device_array<address_map_bank_device, 4> m_bankdev;
 	required_memory_region m_lcd_char_rom;
 	int m_lcd_scrollx;
 	int m_lcd_scrolly;
 	int m_lcd_mode;
 	int m_lcd_size;
-	int m_irq_via0;
-	int m_irq_via1;
-	int m_irq_acia;
 	int m_mmu_mode;
 	int m_mmu_saved_mode;
 	uint8_t m_mmu_offset1;
@@ -586,14 +511,7 @@ private:
 	int m_key_column;
 	uint16_t m_key_shift;
 	int m_key_force_format;
-	required_ioport m_col0;
-	required_ioport m_col1;
-	required_ioport m_col2;
-	required_ioport m_col3;
-	required_ioport m_col4;
-	required_ioport m_col5;
-	required_ioport m_col6;
-	required_ioport m_col7;
+	required_ioport_array<8> m_col;
 	required_ioport m_special;
 };
 
@@ -621,10 +539,10 @@ void clcd_state::clcd_banked_mem(address_map &map)
 void clcd_state::clcd_mem(address_map &map)
 {
 	map(0x0000, 0x0fff).rw(FUNC(clcd_state::ram_r), FUNC(clcd_state::ram_w));
-	map(0x1000, 0x3fff).rw(m_bank1, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
-	map(0x4000, 0x7fff).rw(m_bank2, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
-	map(0x8000, 0xbfff).rw(m_bank3, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
-	map(0xc000, 0xf7ff).rw(m_bank4, FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
+	map(0x1000, 0x3fff).rw(m_bankdev[0], FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
+	map(0x4000, 0x7fff).rw(m_bankdev[1], FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
+	map(0x8000, 0xbfff).rw(m_bankdev[2], FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
+	map(0xc000, 0xf7ff).rw(m_bankdev[3], FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
 	map(0xf800, 0xf80f).mirror(0x70).rw(m_via0, FUNC(via6522_device::read), FUNC(via6522_device::write));
 	map(0xf880, 0xf88f).mirror(0x70).rw("via1", FUNC(via6522_device::read), FUNC(via6522_device::write));
 	map(0xf980, 0xf983).mirror(0x7c).rw(m_acia, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
@@ -744,25 +662,27 @@ MACHINE_CONFIG_START(clcd_state::clcd)
 	MCFG_DEVICE_ADD("maincpu", M65C02, 2000000)
 	MCFG_DEVICE_PROGRAM_MAP(clcd_mem)
 
+	INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline("maincpu", m65c02_device::IRQ_LINE);
+
 	via6522_device &via0(VIA6522(config, "via0", 2000000));
 	via0.writepa_handler().set(FUNC(clcd_state::via0_pa_w));
 	via0.writepb_handler().set(FUNC(clcd_state::via0_pb_w));
 	via0.cb1_handler().set(FUNC(clcd_state::via0_cb1_w));
-	via0.irq_handler().set(FUNC(clcd_state::write_irq_via0));
+	via0.irq_handler().set("mainirq", FUNC(input_merger_device::in_w<0>));
 
 	via6522_device &via1(VIA6522(config, "via1", 2000000));
 	via1.writepa_handler().set(FUNC(clcd_state::via1_pa_w));
 	via1.writepb_handler().set(FUNC(clcd_state::via1_pb_w));
-	via1.irq_handler().set(FUNC(clcd_state::write_irq_via1));
+	via1.irq_handler().set("mainirq", FUNC(input_merger_device::in_w<1>));
 	via1.ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe)).invert();
 	via1.cb2_handler().set("speaker", FUNC(speaker_sound_device::level_w));
 
-	MCFG_DEVICE_ADD("acia", MOS6551, 2000000)
-	MCFG_MOS6551_XTAL(XTAL(1'843'200))
-	MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, clcd_state, write_irq_acia))
-	MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
-	MCFG_MOS6551_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
-	MCFG_MOS6551_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+	MOS6551(config, m_acia, 2000000);
+	m_acia->set_xtal(XTAL(1'843'200));
+	m_acia->irq_handler().set("mainirq", FUNC(input_merger_device::in_w<2>));
+	m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
+	m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
+	m_acia->dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
 
 	MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
 	MCFG_RS232_RXD_HANDLER(WRITELINE("acia", mos6551_device, write_rxd))
@@ -773,38 +693,23 @@ MACHINE_CONFIG_START(clcd_state::clcd)
 	CENTRONICS(config, m_centronics, centronics_devices, nullptr);
 	m_centronics->busy_handler().set("via1", FUNC(via6522_device::write_pb6)).invert();
 
-	MCFG_DEVICE_ADD("bank1", ADDRESS_MAP_BANK, 0)
-	MCFG_DEVICE_PROGRAM_MAP(clcd_banked_mem)
-	MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
-	MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
-	MCFG_ADDRESS_MAP_BANK_STRIDE(0x400)
+	for (auto &bankdev : m_bankdev)
+	{
+		ADDRESS_MAP_BANK(config, bankdev);
+		bankdev->set_addrmap(AS_PROGRAM, &clcd_state::clcd_banked_mem);
+		bankdev->set_endianness(ENDIANNESS_LITTLE);
+		bankdev->set_data_width(8);
+		bankdev->set_stride(0x400);
+	}
 
-	MCFG_DEVICE_ADD("bank2", ADDRESS_MAP_BANK, 0)
-	MCFG_DEVICE_PROGRAM_MAP(clcd_banked_mem)
-	MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
-	MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
-	MCFG_ADDRESS_MAP_BANK_STRIDE(0x400)
-
-	MCFG_DEVICE_ADD("bank3", ADDRESS_MAP_BANK, 0)
-	MCFG_DEVICE_PROGRAM_MAP(clcd_banked_mem)
-	MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
-	MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
-	MCFG_ADDRESS_MAP_BANK_STRIDE(0x400)
-
-	MCFG_DEVICE_ADD("bank4", ADDRESS_MAP_BANK, 0)
-	MCFG_DEVICE_PROGRAM_MAP(clcd_banked_mem)
-	MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
-	MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
-	MCFG_ADDRESS_MAP_BANK_STRIDE(0x400)
-
-	MCFG_DEVICE_ADD("rtc", MSM58321, XTAL(32'768))
-	MCFG_MSM58321_D0_HANDLER(WRITELINE("via1", via6522_device, write_pa0))
-	MCFG_MSM58321_D1_HANDLER(WRITELINE("via1", via6522_device, write_pa1))
-	MCFG_MSM58321_D2_HANDLER(WRITELINE("via1", via6522_device, write_pa2))
-	MCFG_MSM58321_D3_HANDLER(WRITELINE("via1", via6522_device, write_pa3))
-	MCFG_MSM58321_BUSY_HANDLER(WRITELINE("via1", via6522_device, write_pa7))
-	MCFG_MSM58321_YEAR0(1984)
-	MCFG_MSM58321_DEFAULT_24H(true)
+	MSM58321(config, m_rtc, XTAL(32'768));
+	m_rtc->d0_handler().set("via1", FUNC(via6522_device::write_pa0));
+	m_rtc->d1_handler().set("via1", FUNC(via6522_device::write_pa1));
+	m_rtc->d2_handler().set("via1", FUNC(via6522_device::write_pa2));
+	m_rtc->d3_handler().set("via1", FUNC(via6522_device::write_pa3));
+	m_rtc->busy_handler().set("via1", FUNC(via6522_device::write_pa7));
+	m_rtc->set_year0(1984);
+	m_rtc->set_default_24h(true);
 
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", LCD)