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

Commit 5629d41d authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Bring in some changes made to arch/ppc and include/asm-ppc64 



Recent commits upstream have changed files which are currently
duplicated in arch/powerpc and include/asm-powerpc.  This updates
them with the corresponding changes.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3eac8c69

arch/powerpc/platforms/powermac/cpufreq.c

+7 −0
Original line number Diff line number Diff line
@@ -695,6 +695,13 @@ static int __init pmac_cpufreq_setup(void) 
		set_speed_proc = pmu_set_cpu_speed;

		is_pmu_based = 1;

	}

	/* Else check for TiPb 550 */

	else if (machine_is_compatible("PowerBook3,3") && cur_freq == 550000) {

		hi_freq = cur_freq;

		low_freq = 500000;

		set_speed_proc = pmu_set_cpu_speed;

		is_pmu_based = 1;

	}

	/* Else check for TiPb 400 & 500 */

	else if (machine_is_compatible("PowerBook3,2")) {

		/* We only know about the 400 MHz and the 500Mhz model

arch/powerpc/platforms/powermac/feature.c

+4 −0
Original line number Diff line number Diff line
@@ -2382,6 +2382,10 @@ static struct pmac_mb_def pmac_mb_defs[] = { 
		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,

		PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,

	},

	{	"PowerBook6,7",			"iBook G4",

		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,

		PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,

	},

	{	"PowerBook6,8",			"PowerBook G4 12\"",

		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,

		PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,

arch/powerpc/platforms/powermac/time.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ via_calibrate_decr(void) 
		;

	dend = get_dec();



	tb_ticks_per_jiffy = (dstart - dend) / (6 * (HZ/100));

	tb_ticks_per_jiffy = (dstart - dend) / ((6 * HZ)/100);

	tb_to_us = mulhwu_scale_factor(dstart - dend, 60000);



	printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n",

include/asm-powerpc/iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ extern void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist, 
		int nelems, enum dma_data_direction direction);



extern void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size,

		dma_addr_t *dma_handle, unsigned int __nocast flag);

		dma_addr_t *dma_handle, gfp_t flag);

extern void iommu_free_coherent(struct iommu_table *tbl, size_t size,

		void *vaddr, dma_addr_t dma_handle);

extern dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr,