Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebd72227 authored by Finn Thain's avatar Finn Thain Committed by Michael Ellerman
Browse files

macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver 



Now that the PowerMac via-pmu driver supports m68k PowerBooks,
switch over to that driver and remove the via-pmu68k driver.

Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 54c99077

arch/m68k/configs/mac_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ CONFIG_TCM_PSCSI=m 
CONFIG_ADB=y

CONFIG_ADB_MACII=y

CONFIG_ADB_IOP=y

CONFIG_ADB_PMU68K=y

CONFIG_ADB_PMU=y

CONFIG_ADB_CUDA=y

CONFIG_INPUT_ADBHID=y

CONFIG_MAC_EMUMOUSEBTN=y

arch/m68k/configs/multi_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ CONFIG_TCM_PSCSI=m 
CONFIG_ADB=y

CONFIG_ADB_MACII=y

CONFIG_ADB_IOP=y

CONFIG_ADB_PMU68K=y

CONFIG_ADB_PMU=y

CONFIG_ADB_CUDA=y

CONFIG_INPUT_ADBHID=y

CONFIG_MAC_EMUMOUSEBTN=y

arch/m68k/mac/config.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static void __init mac_identify(void) 
#ifdef CONFIG_ADB_CUDA

	find_via_cuda();

#endif

#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

	find_via_pmu();

#endif

}

arch/m68k/mac/misc.c

+8 −40
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void cuda_write_pram(int offset, __u8 data) 
}

#endif /* CONFIG_ADB_CUDA */



#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

static long pmu_read_time(void)

{

	struct adb_request req;
@@ -136,7 +136,7 @@ static void pmu_write_pram(int offset, __u8 data) 
	while (!req.complete)

		pmu_poll();

}

#endif /* CONFIG_ADB_PMU68K */

#endif /* CONFIG_ADB_PMU */



/*

 * VIA PRAM/RTC access routines
@@ -367,38 +367,6 @@ static void cuda_shutdown(void) 
}

#endif /* CONFIG_ADB_CUDA */



#ifdef CONFIG_ADB_PMU68K



void pmu_restart(void)

{

	struct adb_request req;

	if (pmu_request(&req, NULL,

			2, PMU_SET_INTR_MASK, PMU_INT_ADB|PMU_INT_TICK) < 0)

		return;

	while (!req.complete)

		pmu_poll();

	if (pmu_request(&req, NULL, 1, PMU_RESET) < 0)

		return;

	while (!req.complete)

		pmu_poll();

}



void pmu_shutdown(void)

{

	struct adb_request req;

	if (pmu_request(&req, NULL,

			2, PMU_SET_INTR_MASK, PMU_INT_ADB|PMU_INT_TICK) < 0)

		return;

	while (!req.complete)

		pmu_poll();

	if (pmu_request(&req, NULL, 5, PMU_SHUTDOWN, 'M', 'A', 'T', 'T') < 0)

		return;

	while (!req.complete)

		pmu_poll();

}



#endif



/*

 *-------------------------------------------------------------------

 * Below this point are the generic routines; they'll dispatch to the
@@ -423,7 +391,7 @@ void mac_pram_read(int offset, __u8 *buffer, int len) 
		func = cuda_read_pram;

		break;

#endif

#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

	case MAC_ADB_PB2:

		func = pmu_read_pram;

		break;
@@ -453,7 +421,7 @@ void mac_pram_write(int offset, __u8 *buffer, int len) 
		func = cuda_write_pram;

		break;

#endif

#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

	case MAC_ADB_PB2:

		func = pmu_write_pram;

		break;
@@ -477,7 +445,7 @@ void mac_poweroff(void) 
	           macintosh_config->adb_type == MAC_ADB_CUDA) {

		cuda_shutdown();

#endif

#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

	} else if (macintosh_config->adb_type == MAC_ADB_PB2) {

		pmu_shutdown();

#endif
@@ -518,7 +486,7 @@ void mac_reset(void) 
	           macintosh_config->adb_type == MAC_ADB_CUDA) {

		cuda_restart();

#endif

#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

	} else if (macintosh_config->adb_type == MAC_ADB_PB2) {

		pmu_restart();

#endif
@@ -670,7 +638,7 @@ int mac_hwclk(int op, struct rtc_time *t) 
			now = cuda_read_time();

			break;

#endif

#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

		case MAC_ADB_PB2:

			now = pmu_read_time();

			break;
@@ -706,7 +674,7 @@ int mac_hwclk(int op, struct rtc_time *t) 
			cuda_write_time(now);

			break;

#endif

#ifdef CONFIG_ADB_PMU68K

#ifdef CONFIG_ADB_PMU

		case MAC_ADB_PB2:

			pmu_write_time(now);

			break;

drivers/macintosh/Kconfig

+1 −12
Original line number Diff line number Diff line
@@ -39,17 +39,6 @@ config ADB_IOP 
	  <http://www.angelfire.com/ca2/dev68k/iopdesc.html> to enable direct

	  support for it, say 'Y' here.



config ADB_PMU68K

	bool "Include PMU (Powerbook) ADB driver"

	depends on ADB && MAC

	help

	  Say Y here if want your kernel to support the m68k based Powerbooks.

	  This includes the PowerBook 140, PowerBook 145, PowerBook 150,

	  PowerBook 160, PowerBook 165, PowerBook 165c, PowerBook 170,

	  PowerBook 180, PowerBook, 180c, PowerBook 190cs, PowerBook 520,

	  PowerBook Duo 210, PowerBook Duo 230, PowerBook Duo 250,

	  PowerBook Duo 270c, PowerBook Duo 280 and PowerBook Duo 280c.



# we want to change this to something like CONFIG_SYSCTRL_CUDA/PMU

config ADB_CUDA

	bool "Support for Cuda/Egret based Macs and PowerMacs"
@@ -66,7 +55,7 @@ config ADB_CUDA 


config ADB_PMU

	bool "Support for PMU based PowerMacs and PowerBooks"

	depends on PPC_PMAC

	depends on PPC_PMAC || MAC

	help

	  On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the

	  PMU is an embedded microprocessor whose primary function is to