OF Device tree merge patches
Subsystems (13)
cover OF Device tree merge patches
Hi everyone. Here are a few patches that I've got sitting in my test-devicetree branch, but I haven't posted for review yet. Please take a look and let me know if they are okay. Once I've collected acks I'll move them over to my next-devicetree branch.
Thanks,
g.
---
Grant Likely (3):
of/flattree: merge early_init_dt_scan_memory() common code
of: add 'of_' prefix to machine_is_compatible()
microblaze: remove early_init_dt_scan_cpus() and phyp_dump_*()
arch/microblaze/include/asm/prom.h | 4 arch/microblaze/kernel/prom.c | 284 ------------------------- arch/powerpc/include/asm/prom.h | 4 arch/powerpc/kernel/pci_64.c | 2 arch/powerpc/kernel/prom.c | 149 ++----------- arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 arch/powerpc/platforms/cell/cbe_powerbutton.c | 2 arch/powerpc/platforms/cell/ras.c | 2 arch/powerpc/platforms/pasemi/cpufreq.c | 4 arch/powerpc/platforms/powermac/cpufreq_32.c | 14 + arch/powerpc/platforms/powermac/cpufreq_64.c | 14 + arch/powerpc/platforms/powermac/feature.c | 2 arch/powerpc/platforms/powermac/smp.c | 12 + arch/powerpc/platforms/powermac/time.c | 8 - arch/powerpc/platforms/powermac/udbg_scc.c | 6 - arch/powerpc/sysdev/grackle.c | 4 arch/sparc/kernel/prom_common.c | 12 - drivers/char/hvc_beat.c | 2 drivers/gpu/drm/radeon/radeon_combios.c | 44 ++-- drivers/macintosh/adb.c | 4 drivers/macintosh/therm_pm72.c | 8 - drivers/macintosh/therm_windtunnel.c | 2 drivers/macintosh/via-pmu-backlight.c | 8 - drivers/macintosh/via-pmu.c | 8 - drivers/macintosh/windfarm_core.c | 6 - drivers/macintosh/windfarm_cpufreq_clamp.c | 6 - drivers/macintosh/windfarm_lm75_sensor.c | 6 - drivers/macintosh/windfarm_max6690_sensor.c | 6 - drivers/macintosh/windfarm_pm112.c | 2 drivers/macintosh/windfarm_pm121.c | 2 drivers/macintosh/windfarm_pm81.c | 4 drivers/macintosh/windfarm_pm91.c | 2 drivers/macintosh/windfarm_smu_sensors.c | 6 - drivers/net/mace.c | 2 drivers/of/Kconfig | 4 drivers/of/base.c | 98 ++++++++- drivers/of/fdt.c | 50 ++++ drivers/serial/pmac_zilog.c | 6 - drivers/video/aty/aty128fb.c | 14 + drivers/video/aty/atyfb_base.c | 8 - drivers/video/aty/radeon_backlight.c | 6 - include/linux/of.h | 6 + include/linux/of_fdt.h | 5 sound/ppc/awacs.c | 24 +- sound/ppc/burgundy.c | 4 sound/ppc/pmac.c | 18 +- sound/soc/fsl/efika-audio-fabric.c | 2 sound/soc/fsl/pcm030-audio-fabric.c | 2 48 files changed, 317 insertions(+), 575 deletions(-)
Signature · 1 line
Signature
PATCH 1/3 microblaze: remove early_init_dt_scan_cpus() and phyp_dump_*()
Microblaze only has one CPU, it isn't SMP at all. early_init_dt_scan_cpus() is effectively just a no-op, so remove it.
Microblaze doesn't support hypervisor assisted dump either, so the phyp stuff can also go.
---
v2 - added phyp code removal
arch/microblaze/kernel/prom.c | 153 ----------------------------------------- 1 files changed, 0 insertions(+), 153 deletions(-)
arch/microblaze/kernel/prom.c +0 -153
@@ -47,67 +47,6 @@ struct device_node *of_chosen;#define early_init_dt_scan_drconf_memory (node) 0 -static int __init early_init_dt_scan_cpus (unsigned long node, -const char *uname,int depth, -void *data) -{ -static int logical_cpuid; -char *type =of_get_flat_dt_prop (node,"device_type" ,NULL ); -const u32 *intserv; -int i, nthreads; -int found =0 ; - -/* We are scanning "cpu" nodes only */ -if (type ==NULL ||strcmp (type,"cpu" ) !=0 ) -return 0 ; - -/* Get physical cpuid */ - intserv =of_get_flat_dt_prop (node,"reg" ,NULL ); - nthreads =1 ; - -/* -* Now see if any of these threads match our boot cpu. -* NOTE: This must match the parsing done in smp_setup_cpu_maps. -*/ -for (i =0 ; i < nthreads; i++) { -/* -* version 2 of the kexec param format adds the phys cpuid of -* booted proc. -*/ -if (initial_boot_params && initial_boot_params->version >=2 ) { -if (intserv[i] == - initial_boot_params->boot_cpuid_phys) { - found =1 ; -break ; - } - }else { -/* -* Check if it's the boot-cpu, set it's hw index now, -* unfortunately this format did not support booting -* off secondary threads. -*/ -if (of_get_flat_dt_prop (node, -"linux,boot-cpu" ,NULL ) !=NULL ) { - found =1 ; -break ; - } - } - -#ifdef CONFIG_SMP -/* logical cpu id is always 0 on UP kernels */ - logical_cpuid++; -#endif - } - -if (found) { -pr_debug ("boot cpu: logical %d physical %d\n" , logical_cpuid, - intserv[i]); - boot_cpuid = logical_cpuid; - } - -return 0 ; -} -void __init early_init_dt_scan_chosen_arch (unsigned long node) {/* No Microblaze specific code here */
@@ -163,86 +102,6 @@ static int __init early_init_dt_scan_memory(unsigned long node,return 0 ; } -#ifdef CONFIG_PHYP_DUMP -/** -* phyp_dump_calculate_reserve_size() - reserve variable boot area 5% or arg -* -* Function to find the largest size we need to reserve -* during early boot process. -* -* It either looks for boot param and returns that OR -* returns larger of 256 or 5% rounded down to multiples of 256MB. -* -*/ -static inline unsigned long phyp_dump_calculate_reserve_size (void ) -{ -unsigned long tmp; - -if (phyp_dump_info->reserve_bootvar) -return phyp_dump_info->reserve_bootvar; - -/* divide by 20 to get 5% of value */ - tmp =lmb_end_of_DRAM (); -do_div (tmp,20 ); - -/* round it down in multiples of 256 */ - tmp = tmp & ~0x0FFFFFFFUL ; - -return (tmp >PHYP_DUMP_RMR_END ? tmp :PHYP_DUMP_RMR_END ); -} - -/** -* phyp_dump_reserve_mem() - reserve all not-yet-dumped mmemory -* -* This routine may reserve memory regions in the kernel only -* if the system is supported and a dump was taken in last -* boot instance or if the hardware is supported and the -* scratch area needs to be setup. In other instances it returns -* without reserving anything. The memory in case of dump being -* active is freed when the dump is collected (by userland tools). -*/ -static void __init phyp_dump_reserve_mem (void ) -{ -unsigned long base, size; -unsigned long variable_reserve_size; - -if (!phyp_dump_info->phyp_dump_configured) { -printk (KERN_ERR "Phyp-dump not supported on this hardware\n" ); -return ; - } - -if (!phyp_dump_info->phyp_dump_at_boot) { -printk (KERN_INFO "Phyp-dump disabled at boot time\n" ); -return ; - } - - variable_reserve_size =phyp_dump_calculate_reserve_size (); - -if (phyp_dump_info->phyp_dump_is_active) { -/* Reserve *everything* above RMR.Area freed by userland tools*/ - base = variable_reserve_size; - size =lmb_end_of_DRAM () - base; - -/* XXX crashed_ram_end is wrong, since it may be beyond -* the memory_limit, it will need to be adjusted. */ -lmb_reserve (base, size); - - phyp_dump_info->init_reserve_start = base; - phyp_dump_info->init_reserve_size = size; - }else { - size = phyp_dump_info->cpu_state_size + - phyp_dump_info->hpte_region_size + - variable_reserve_size; - base =lmb_end_of_DRAM () - size; -lmb_reserve (base, size); - phyp_dump_info->init_reserve_start = base; - phyp_dump_info->init_reserve_size = size; - } -} -#else -static inline void __init phyp_dump_reserve_mem (void ) {} -#endif /* CONFIG_PHYP_DUMP && CONFIG_PPC_RTAS */ -#ifdef CONFIG_EARLY_PRINTK /* MS this is Microblaze specifig function */ static int __init early_init_dt_scan_serial(unsigned long node,
@@ -284,11 +143,6 @@ void __init early_init_devtree(void *params)/* Setup flat device-tree pointer */ initial_boot_params = params; -#ifdef CONFIG_PHYP_DUMP -/* scan tree to see if dump occured during last boot */ -of_scan_flat_dt (early_init_dt_scan_phyp_dump,NULL ); -#endif -/* Retrieve various informations from the /chosen node of the * device-tree, including the platform type, initrd location and * size, TCE reserve, and more ...
@@ -308,13 +162,6 @@ void __init early_init_devtree(void *params)pr_debug ("Phys. mem: %lx\n" , (unsigned long )lmb_phys_mem_size ()); -pr_debug ("Scanning CPUs ...\n" ); - -/* Retreive CPU related informations from the flat tree -* (altivec support, boot CPU ID, ...) -*/ -of_scan_flat_dt (early_init_dt_scan_cpus,NULL ); -pr_debug (" <- early_init_devtree()\n" ); }
PATCH 2/3 of: add 'of_' prefix to machine_is_compatible()
In reply to Grant Likelymachine is compatible is an OF-specific call. It should have the of_ prefix to protect the global namespace.
---
arch/powerpc/kernel/pci_64.c | 2 + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 +- arch/powerpc/platforms/cell/cbe_powerbutton.c | 2 + arch/powerpc/platforms/cell/ras.c | 2 + arch/powerpc/platforms/pasemi/cpufreq.c | 4 +- arch/powerpc/platforms/powermac/cpufreq_32.c | 14 ++++---- arch/powerpc/platforms/powermac/cpufreq_64.c | 14 ++++---- arch/powerpc/platforms/powermac/feature.c | 2 + arch/powerpc/platforms/powermac/smp.c | 12 +++---- arch/powerpc/platforms/powermac/time.c | 8 ++--- arch/powerpc/platforms/powermac/udbg_scc.c | 6 ++- arch/powerpc/sysdev/grackle.c | 4 +- drivers/char/hvc_beat.c | 2 + drivers/gpu/drm/radeon/radeon_combios.c | 44 +++++++++++++------------ drivers/macintosh/adb.c | 4 +- drivers/macintosh/therm_pm72.c | 8 ++--- drivers/macintosh/therm_windtunnel.c | 2 + drivers/macintosh/via-pmu-backlight.c | 8 ++--- drivers/macintosh/via-pmu.c | 8 ++--- drivers/macintosh/windfarm_core.c | 6 ++- drivers/macintosh/windfarm_cpufreq_clamp.c | 6 ++- drivers/macintosh/windfarm_lm75_sensor.c | 6 ++- drivers/macintosh/windfarm_max6690_sensor.c | 6 ++- drivers/macintosh/windfarm_pm112.c | 2 + drivers/macintosh/windfarm_pm121.c | 2 + drivers/macintosh/windfarm_pm81.c | 4 +- drivers/macintosh/windfarm_pm91.c | 2 + drivers/macintosh/windfarm_smu_sensors.c | 6 ++- drivers/net/mace.c | 2 + drivers/of/base.c | 6 ++- drivers/serial/pmac_zilog.c | 6 ++- drivers/video/aty/aty128fb.c | 14 ++++---- drivers/video/aty/atyfb_base.c | 8 ++--- drivers/video/aty/radeon_backlight.c | 6 ++- include/linux/of_fdt.h | 2 + sound/ppc/awacs.c | 24 +++++++------- sound/ppc/burgundy.c | 4 +- sound/ppc/pmac.c | 18 +++++----- sound/soc/fsl/efika-audio-fabric.c | 2 + sound/soc/fsl/pcm030-audio-fabric.c | 2 + 40 files changed, 142 insertions(+), 142 deletions(-)
arch/powerpc/kernel/pci_64.c +1 -1
@@ -224,7 +224,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,* G5 machines... So when something asks for bus 0 io base * (bus 0 is HT root), we return the AGP one instead. */ -if (in_bus ==0 &&machine_is_compatible ("MacRISC4" )) { +if (in_bus ==0 &&of_machine_is_compatible ("MacRISC4" )) {struct device_node *agp; agp =of_find_compatible_node (NULL ,NULL ,"u3-agp" );
arch/powerpc/platforms/85xx/xes_mpc85xx.c +2 -2
@@ -80,8 +80,8 @@ static void xes_mpc85xx_configure_l2(void __iomem *l2_base)printk (KERN_INFO "xes_mpc85xx: Enabling L2 as cache\n" ); ctl = MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2I; -if (machine_is_compatible ("MPC8540" ) || -machine_is_compatible ("MPC8560" )) +if (of_machine_is_compatible ("MPC8540" ) || +of_machine_is_compatible ("MPC8560" ))/* * Assume L2 SRAM is used fully for cache, so set * L2BLKSZ (bits 4:5) to match L2SIZ (bits 2:3).
arch/powerpc/platforms/cell/cbe_powerbutton.c +1 -1
@@ -48,7 +48,7 @@ static int __init cbe_powerbutton_init(void)int ret =0 ;struct input_dev *dev; -if (!machine_is_compatible ("IBM,CBPLUS-1.0" )) { +if (!of_machine_is_compatible ("IBM,CBPLUS-1.0" )) {printk (KERN_ERR "%s: Not a cell blade.\n" , __func__); ret = -ENODEV ; goto out;
arch/powerpc/platforms/cell/ras.c +1 -1
@@ -255,7 +255,7 @@ static int __init cbe_sysreset_init(void) {struct cbe_pmd_regs __iomem *regs; - sysreset_hack =machine_is_compatible ("IBM,CBPLUS-1.0" ); + sysreset_hack =of_machine_is_compatible ("IBM,CBPLUS-1.0" );if (!sysreset_hack)return 0 ;
arch/powerpc/platforms/pasemi/cpufreq.c +2 -2
@@ -304,8 +304,8 @@ static struct cpufreq_driver pas_cpufreq_driver = {static int __init pas_cpufreq_init (void ) { -if (!machine_is_compatible ("PA6T-1682M" ) && - !machine_is_compatible ("pasemi,pwrficient" )) +if (!of_machine_is_compatible ("PA6T-1682M" ) && + !of_machine_is_compatible ("pasemi,pwrficient" ))return -ENODEV ;return cpufreq_register_driver (&pas_cpufreq_driver);
arch/powerpc/platforms/powermac/cpufreq_32.c +7 -7
@@ -657,31 +657,31 @@ static int __init pmac_cpufreq_setup(void) cur_freq = (*value) /1000 ;/* Check for 7447A based MacRISC3 */ -if (machine_is_compatible ("MacRISC3" ) && +if (of_machine_is_compatible ("MacRISC3" ) &&of_get_property (cpunode,"dynamic-power-step" ,NULL ) &&PVR_VER (mfspr (SPRN_PVR )) ==0x8003 ) {pmac_cpufreq_init_7447A (cpunode);/* Check for other MacRISC3 machines */ - }else if (machine_is_compatible ("PowerBook3,4" ) || -machine_is_compatible ("PowerBook3,5" ) || -machine_is_compatible ("MacRISC3" )) { + }else if (of_machine_is_compatible ("PowerBook3,4" ) || +of_machine_is_compatible ("PowerBook3,5" ) || +of_machine_is_compatible ("MacRISC3" )) {pmac_cpufreq_init_MacRISC3 (cpunode);/* Else check for iBook2 500/600 */ - }else if (machine_is_compatible ("PowerBook4,1" )) { + }else if (of_machine_is_compatible ("PowerBook4,1" )) { hi_freq = cur_freq; low_freq =400000 ; 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 ) { +else if (of_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" )) { +else if (of_machine_is_compatible ("PowerBook3,2" )) {/* We only know about the 400 MHz and the 500Mhz model * they both have 300 MHz as low frequency */
arch/powerpc/platforms/powermac/cpufreq_64.c +7 -7
@@ -398,11 +398,11 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)int rc = -ENODEV ;/* Check supported platforms */ -if (machine_is_compatible ("PowerMac8,1" ) || -machine_is_compatible ("PowerMac8,2" ) || -machine_is_compatible ("PowerMac9,1" )) +if (of_machine_is_compatible ("PowerMac8,1" ) || +of_machine_is_compatible ("PowerMac8,2" ) || +of_machine_is_compatible ("PowerMac9,1" )) use_volts_smu =1 ; -else if (machine_is_compatible ("PowerMac11,2" )) +else if (of_machine_is_compatible ("PowerMac11,2" )) use_volts_vdnap =1 ;else return -ENODEV ;
@@ -729,9 +729,9 @@ static int __init g5_cpufreq_init(void)return -ENODEV ; } -if (machine_is_compatible ("PowerMac7,2" ) || -machine_is_compatible ("PowerMac7,3" ) || -machine_is_compatible ("RackMac3,1" )) +if (of_machine_is_compatible ("PowerMac7,2" ) || +of_machine_is_compatible ("PowerMac7,3" ) || +of_machine_is_compatible ("RackMac3,1" )) rc =g5_pm72_cpufreq_init (cpus);#ifdef CONFIG_PMAC_SMU else
arch/powerpc/platforms/powermac/feature.c +1 -1
@@ -2426,7 +2426,7 @@ static int __init probe_motherboard(void) } }for (i=0 ; i<ARRAY_SIZE (pmac_mb_defs); i++) { -if (machine_is_compatible (pmac_mb_defs[i].model_string)) { +if (of_machine_is_compatible (pmac_mb_defs[i].model_string)) { pmac_mb = pmac_mb_defs[i]; goto found; }
arch/powerpc/platforms/powermac/smp.c +6 -6
@@ -693,9 +693,9 @@ static void __init smp_core99_setup(int ncpus)#ifdef CONFIG_PPC64 /* i2c based HW sync on some G5s */ -if (machine_is_compatible ("PowerMac7,2" ) || -machine_is_compatible ("PowerMac7,3" ) || -machine_is_compatible ("RackMac3,1" )) +if (of_machine_is_compatible ("PowerMac7,2" ) || +of_machine_is_compatible ("PowerMac7,3" ) || +of_machine_is_compatible ("RackMac3,1" ))smp_core99_setup_i2c_hwsync (ncpus);/* pfunc based HW sync on recent G5s */
@@ -713,7 +713,7 @@ static void __init smp_core99_setup(int ncpus)#else /* CONFIG_PPC64 */ /* GPIO based HW sync on ppc32 Core99 */ -if (pmac_tb_freeze ==NULL && !machine_is_compatible ("MacRISC4" )) { +if (pmac_tb_freeze ==NULL && !of_machine_is_compatible ("MacRISC4" )) {struct device_node *cpu;const u32 *tbprop =NULL ;
@@ -750,7 +750,7 @@ static void __init smp_core99_setup(int ncpus)#endif /* 32 bits SMP can't NAP */ -if (!machine_is_compatible ("MacRISC4" )) +if (!of_machine_is_compatible ("MacRISC4" )) powersave_nap =0 ; }
@@ -852,7 +852,7 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)/* If we didn't start the second CPU, we must take * it off the bus */ -if (machine_is_compatible ("MacRISC4" ) && +if (of_machine_is_compatible ("MacRISC4" ) &&num_online_cpus () <2 )g5_phy_disable_cpu1 ();#endif /* CONFIG_PPC64 */
arch/powerpc/platforms/powermac/time.c +4 -4
@@ -317,9 +317,9 @@ void __init pmac_calibrate_decr(void)* calibration. That's better since the VIA itself seems * to be slightly off. --BenH */ -if (!machine_is_compatible ("MacRISC2" ) && - !machine_is_compatible ("MacRISC3" ) && - !machine_is_compatible ("MacRISC4" )) +if (!of_machine_is_compatible ("MacRISC2" ) && + !of_machine_is_compatible ("MacRISC3" ) && + !of_machine_is_compatible ("MacRISC4" ))if (via_calibrate_decr ())return ;
@@ -328,7 +328,7 @@ void __init pmac_calibrate_decr(void)* probably implement calibration based on the KL timer on these * machines anyway... -BenH */ -if (machine_is_compatible ("PowerMac3,5" )) +if (of_machine_is_compatible ("PowerMac3,5" ))if (via_calibrate_decr ())return ;#endif
arch/powerpc/platforms/powermac/udbg_scc.c +3 -3
@@ -132,9 +132,9 @@ void udbg_scc_init(int force_scc) scc_inittab[1 ] =in_8 (sccc);out_8 (sccc,12 ); scc_inittab[3 ] =in_8 (sccc); - }else if (machine_is_compatible ("RackMac1,1" ) - ||machine_is_compatible ("RackMac1,2" ) - ||machine_is_compatible ("MacRISC4" )) { + }else if (of_machine_is_compatible ("RackMac1,1" ) + ||of_machine_is_compatible ("RackMac1,2" ) + ||of_machine_is_compatible ("MacRISC4" )) {/* Xserves and G5s default to 57600 */ scc_inittab[1 ] =0 ; scc_inittab[3 ] =0 ;
arch/powerpc/sysdev/grackle.c +2 -2
@@ -56,9 +56,9 @@ static inline void grackle_set_loop_snoop(struct pci_controller *bp, int enable)void __init setup_grackle (struct pci_controller *hose) {setup_indirect_pci (hose,0xfec00000 ,0xfee00000 ,0 ); -if (machine_is_compatible ("PowerMac1,1" )) +if (of_machine_is_compatible ("PowerMac1,1" ))ppc_pci_add_flags (PPC_PCI_REASSIGN_ALL_BUS ); -if (machine_is_compatible ("AAPL,PowerBook1998" )) +if (of_machine_is_compatible ("AAPL,PowerBook1998" ))grackle_set_loop_snoop (hose,1 );#if 0 /* Disabled for now, HW problems ??? */ grackle_set_stg (hose,1 );
drivers/char/hvc_beat.c +1 -1
@@ -99,7 +99,7 @@ static int hvc_beat_config(char *p)static int __init hvc_beat_console_init (void ) { -if (hvc_beat_useit &&machine_is_compatible ("Beat" )) { +if (hvc_beat_useit &&of_machine_is_compatible ("Beat" )) {hvc_instantiate (0 ,0 , &hvc_beat_get_put_ops); }return 0 ;
drivers/gpu/drm/radeon/radeon_combios.c +22 -22
69 lines not on this page · raw message
drivers/macintosh/adb.c +2 -2
@@ -322,8 +322,8 @@ static int __init adb_init(void) adb_controller =NULL ; }else {#ifdef CONFIG_PPC -if (machine_is_compatible ("AAPL,PowerBook1998" ) || -machine_is_compatible ("PowerBook1,1" )) +if (of_machine_is_compatible ("AAPL,PowerBook1998" ) || +of_machine_is_compatible ("PowerBook1,1" )) sleepy_trackpad =1 ;#endif /* CONFIG_PPC */
drivers/macintosh/therm_pm72.c +4 -4
@@ -1899,7 +1899,7 @@ static int create_control_loops(void)*/ if (rackmac) cpu_pid_type =CPU_PID_TYPE_RACKMAC ; -else if (machine_is_compatible ("PowerMac7,3" ) +else if (of_machine_is_compatible ("PowerMac7,3" ) && (cpu_count >1 ) && fcu_fans[CPUA_PUMP_RPM_INDEX ].id !=FCU_FAN_ABSENT_ID && fcu_fans[CPUB_PUMP_RPM_INDEX ].id !=FCU_FAN_ABSENT_ID ) {
@@ -2234,10 +2234,10 @@ static int __init therm_pm72_init(void) {struct device_node *np; - rackmac =machine_is_compatible ("RackMac3,1" ); + rackmac =of_machine_is_compatible ("RackMac3,1" ); -if (!machine_is_compatible ("PowerMac7,2" ) && - !machine_is_compatible ("PowerMac7,3" ) && +if (!of_machine_is_compatible ("PowerMac7,2" ) && + !of_machine_is_compatible ("PowerMac7,3" ) && !rackmac)return -ENODEV ;
drivers/macintosh/therm_windtunnel.c +1 -1
@@ -490,7 +490,7 @@ g4fan_init( void ) info =of_get_property (np,"thermal-info" ,NULL );of_node_put (np); -if ( !info || !machine_is_compatible ("PowerMac3,6" ) ) +if ( !info || !of_machine_is_compatible ("PowerMac3,6" ) )return -ENODEV ;if ( info->id !=3 ) {
drivers/macintosh/via-pmu-backlight.c +4 -4
@@ -150,13 +150,13 @@ void __init pmu_backlight_init()/* Special case for the old PowerBook since I can't test on it */ autosave = -machine_is_compatible ("AAPL,3400/2400" ) || -machine_is_compatible ("AAPL,3500" ); +of_machine_is_compatible ("AAPL,3400/2400" ) || +of_machine_is_compatible ("AAPL,3500" );if (!autosave && !pmac_has_backlight_type ("pmu" ) && - !machine_is_compatible ("AAPL,PowerBook1998" ) && - !machine_is_compatible ("PowerBook1,1" )) + !of_machine_is_compatible ("AAPL,PowerBook1998" ) && + !of_machine_is_compatible ("PowerBook1,1" ))return ;snprintf (name,sizeof (name),"pmubl" );
drivers/macintosh/via-pmu.c +4 -4
@@ -463,8 +463,8 @@ static int __init via_pmu_dev_init(void)#endif #ifdef CONFIG_PPC32 -if (machine_is_compatible ("AAPL,3400/2400" ) || -machine_is_compatible ("AAPL,3500" )) { +if (of_machine_is_compatible ("AAPL,3400/2400" ) || +of_machine_is_compatible ("AAPL,3500" )) {int mb =pmac_call_feature (PMAC_FTR_GET_MB_INFO ,NULL ,PMAC_MB_INFO_MODEL ,0 ); pmu_battery_count =1 ;
@@ -472,8 +472,8 @@ static int __init via_pmu_dev_init(void) pmu_batteries[0 ].flags |=PMU_BATT_TYPE_COMET ; else pmu_batteries[0].flags |= PMU_BATT_TYPE_HOOPER; - }else if (machine_is_compatible ("AAPL,PowerBook1998" ) || -machine_is_compatible ("PowerBook1,1" )) { + }else if (of_machine_is_compatible ("AAPL,PowerBook1998" ) || +of_machine_is_compatible ("PowerBook1,1" )) { pmu_battery_count =2 ; pmu_batteries[0 ].flags |=PMU_BATT_TYPE_SMART ; pmu_batteries[1 ].flags |=PMU_BATT_TYPE_SMART ;
drivers/macintosh/windfarm_core.c +3 -3
@@ -468,9 +468,9 @@ static int __init windfarm_core_init(void)DBG ("wf: core loaded\n" );/* Don't register on old machines that use therm_pm72 for now */ -if (machine_is_compatible ("PowerMac7,2" ) || -machine_is_compatible ("PowerMac7,3" ) || -machine_is_compatible ("RackMac3,1" )) +if (of_machine_is_compatible ("PowerMac7,2" ) || +of_machine_is_compatible ("PowerMac7,3" ) || +of_machine_is_compatible ("RackMac3,1" ))return -ENODEV ;platform_device_register (&wf_platform_device);return 0 ;
drivers/macintosh/windfarm_cpufreq_clamp.c +3 -3
@@ -76,9 +76,9 @@ static int __init wf_cpufreq_clamp_init(void)struct wf_control *clamp;/* Don't register on old machines that use therm_pm72 for now */ -if (machine_is_compatible ("PowerMac7,2" ) || -machine_is_compatible ("PowerMac7,3" ) || -machine_is_compatible ("RackMac3,1" )) +if (of_machine_is_compatible ("PowerMac7,2" ) || +of_machine_is_compatible ("PowerMac7,3" ) || +of_machine_is_compatible ("RackMac3,1" ))return -ENODEV ; clamp =kmalloc (sizeof (struct wf_control ),GFP_KERNEL );
drivers/macintosh/windfarm_lm75_sensor.c +3 -3
@@ -239,9 +239,9 @@ static struct i2c_driver wf_lm75_driver = {static int __init wf_lm75_sensor_init (void ) {/* Don't register on old machines that use therm_pm72 for now */ -if (machine_is_compatible ("PowerMac7,2" ) || -machine_is_compatible ("PowerMac7,3" ) || -machine_is_compatible ("RackMac3,1" )) +if (of_machine_is_compatible ("PowerMac7,2" ) || +of_machine_is_compatible ("PowerMac7,3" ) || +of_machine_is_compatible ("RackMac3,1" ))return -ENODEV ;return i2c_add_driver (&wf_lm75_driver); }
drivers/macintosh/windfarm_max6690_sensor.c +3 -3
@@ -188,9 +188,9 @@ static struct i2c_driver wf_max6690_driver = {static int __init wf_max6690_sensor_init (void ) {/* Don't register on old machines that use therm_pm72 for now */ -if (machine_is_compatible ("PowerMac7,2" ) || -machine_is_compatible ("PowerMac7,3" ) || -machine_is_compatible ("RackMac3,1" )) +if (of_machine_is_compatible ("PowerMac7,2" ) || +of_machine_is_compatible ("PowerMac7,3" ) || +of_machine_is_compatible ("RackMac3,1" ))return -ENODEV ;return i2c_add_driver (&wf_max6690_driver); }
drivers/macintosh/windfarm_pm112.c +1 -1
@@ -676,7 +676,7 @@ static int __init wf_pm112_init(void) {struct device_node *cpu; -if (!machine_is_compatible ("PowerMac11,2" )) +if (!of_machine_is_compatible ("PowerMac11,2" ))return -ENODEV ;/* Count the number of CPU cores */
drivers/macintosh/windfarm_pm121.c +1 -1
@@ -1008,7 +1008,7 @@ static int __init pm121_init(void) {int rc = -ENODEV ; -if (machine_is_compatible ("PowerMac12,1" )) +if (of_machine_is_compatible ("PowerMac12,1" )) rc =pm121_init_pm ();if (rc ==0 ) {
drivers/macintosh/windfarm_pm81.c +2 -2
@@ -779,8 +779,8 @@ static int __init wf_smu_init(void) {int rc = -ENODEV ; -if (machine_is_compatible ("PowerMac8,1" ) || -machine_is_compatible ("PowerMac8,2" )) +if (of_machine_is_compatible ("PowerMac8,1" ) || +of_machine_is_compatible ("PowerMac8,2" )) rc =wf_init_pm ();if (rc ==0 ) {
drivers/macintosh/windfarm_pm91.c +1 -1
@@ -711,7 +711,7 @@ static int __init wf_smu_init(void) {int rc = -ENODEV ; -if (machine_is_compatible ("PowerMac9,1" )) +if (of_machine_is_compatible ("PowerMac9,1" )) rc =wf_init_pm ();if (rc ==0 ) {
drivers/macintosh/windfarm_smu_sensors.c +3 -3
@@ -363,9 +363,9 @@ smu_cpu_power_create(struct wf_sensor *volts, struct wf_sensor *amps)* I yet have to figure out what's up with 8,2 and will have to * adjust for later, unless we can 100% trust the SDB partition... */ -if ((machine_is_compatible ("PowerMac8,1" ) || -machine_is_compatible ("PowerMac8,2" ) || -machine_is_compatible ("PowerMac9,1" )) && +if ((of_machine_is_compatible ("PowerMac8,1" ) || +of_machine_is_compatible ("PowerMac8,2" ) || +of_machine_is_compatible ("PowerMac9,1" )) && cpuvcp_version >=2 ) { pow->quadratic =1 ;DBG ("windfarm: CPU Power using quadratic transform\n" );
drivers/net/mace.c +1 -1
@@ -206,7 +206,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i mp->port_aaui = port_aaui; else {/* Apple Network Server uses the AAUI port */ -if (machine_is_compatible ("AAPL,ShinerESB" )) +if (of_machine_is_compatible ("AAPL,ShinerESB" )) mp->port_aaui =1 ;else {#ifdef CONFIG_MACE_AAUI_PORT
drivers/of/base.c +3 -3
@@ -219,13 +219,13 @@ int of_device_is_compatible(const struct device_node *device,EXPORT_SYMBOL (of_device_is_compatible);/** -* machine_is_compatible - Test root of device tree for a given compatible value +* of_machine_is_compatible - Test root of device tree for a given compatible value * @compat: compatible string to look for in root node's compatible property. * * Returns true if the root node has the given value in its * compatible property. */ -int machine_is_compatible (const char *compat) +int of_machine_is_compatible (const char *compat) {struct device_node *root;int rc =0 ;
@@ -237,7 +237,7 @@ int machine_is_compatible(const char *compat) }return rc; } -EXPORT_SYMBOL (machine_is_compatible); +EXPORT_SYMBOL (of_machine_is_compatible);/** * of_device_is_available - check if a device is available for use
drivers/serial/pmac_zilog.c +3 -3
@@ -2031,9 +2031,9 @@ static int __init pmz_console_setup(struct console *co, char *options)/* * XServe's default to 57600 bps */ -if (machine_is_compatible ("RackMac1,1" ) - ||machine_is_compatible ("RackMac1,2" ) - ||machine_is_compatible ("MacRISC4" )) +if (of_machine_is_compatible ("RackMac1,1" ) + ||of_machine_is_compatible ("RackMac1,2" ) + ||of_machine_is_compatible ("MacRISC4" )) baud =57600 ;/*
drivers/video/aty/aty128fb.c +7 -7
@@ -1931,22 +1931,22 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i* PowerMac2,2 summer 2000 iMacs * PowerMac4,1 january 2001 iMacs "flower power" */ -if (machine_is_compatible ("PowerMac2,1" ) || -machine_is_compatible ("PowerMac2,2" ) || -machine_is_compatible ("PowerMac4,1" )) +if (of_machine_is_compatible ("PowerMac2,1" ) || +of_machine_is_compatible ("PowerMac2,2" ) || +of_machine_is_compatible ("PowerMac4,1" )) default_vmode =VMODE_1024_768_75 ;/* iBook SE */ -if (machine_is_compatible ("PowerBook2,2" )) +if (of_machine_is_compatible ("PowerBook2,2" )) default_vmode =VMODE_800_600_60 ;/* PowerBook Firewire (Pismo), iBook Dual USB */ -if (machine_is_compatible ("PowerBook3,1" ) || -machine_is_compatible ("PowerBook4,1" )) +if (of_machine_is_compatible ("PowerBook3,1" ) || +of_machine_is_compatible ("PowerBook4,1" )) default_vmode =VMODE_1024_768_60 ;/* PowerBook Titanium */ -if (machine_is_compatible ("PowerBook3,2" )) +if (of_machine_is_compatible ("PowerBook3,2" )) default_vmode =VMODE_1152_768_60 ;if (default_cmode >16 )
drivers/video/aty/atyfb_base.c +4 -4
@@ -2439,7 +2439,7 @@ static int __devinit aty_init(struct fb_info *info)* The Apple iBook1 uses non-standard memory frequencies. * We detect it and set the frequency manually. */ -if (machine_is_compatible ("PowerBook2,1" )) { +if (of_machine_is_compatible ("PowerBook2,1" )) { par->pll_limits.mclk =70 ; par->pll_limits.xclk =53 ; }
@@ -2659,7 +2659,7 @@ static int __devinit aty_init(struct fb_info *info)FBINFO_HWACCEL_YPAN ;#ifdef CONFIG_PMAC_BACKLIGHT -if (M64_HAS (G3_PB_1_1 ) &&machine_is_compatible ("PowerBook1,1" )) { +if (M64_HAS (G3_PB_1_1 ) &&of_machine_is_compatible ("PowerBook1,1" )) {/* * these bits let the 101 powerbook * wake up from sleep -- paulus
@@ -2690,9 +2690,9 @@ static int __devinit aty_init(struct fb_info *info)if (M64_HAS (G3_PB_1024x768))/* G3 PowerBook with 1024x768 LCD */ default_vmode =VMODE_1024_768_60 ; -else if (machine_is_compatible ("iMac" )) +else if (of_machine_is_compatible ("iMac" )) default_vmode =VMODE_1024_768_75 ; -else if (machine_is_compatible ("PowerBook2,1" )) +else if (of_machine_is_compatible ("PowerBook2,1" ))/* iBook with 800x600 LCD */ default_vmode =VMODE_800_600_60 ;else
drivers/video/aty/radeon_backlight.c +3 -3
@@ -175,9 +175,9 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)#ifdef CONFIG_PMAC_BACKLIGHT pdata->negative = pdata->negative || -machine_is_compatible ("PowerBook4,3" ) || -machine_is_compatible ("PowerBook6,3" ) || -machine_is_compatible ("PowerBook6,5" ); +of_machine_is_compatible ("PowerBook4,3" ) || +of_machine_is_compatible ("PowerBook6,3" ) || +of_machine_is_compatible ("PowerBook6,5" );#endif rinfo->info->bl_dev = bd;
include/linux/of_fdt.h +1 -1
@@ -85,7 +85,7 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname,extern void finish_device_tree (void );extern void unflatten_device_tree (void );extern void early_init_devtree (void *); -extern int machine_is_compatible (const char *compat); +extern int of_machine_is_compatible (const char *compat);extern void print_properties (struct device_node *node);extern int prom_n_intr_cells (struct device_node * np);extern void prom_get_irq_senses (unsigned char *senses,int off,int max);
sound/ppc/awacs.c +12 -12
@@ -751,8 +751,8 @@ static void snd_pmac_awacs_suspend(struct snd_pmac *chip)static void snd_pmac_awacs_resume (struct snd_pmac *chip) { -if (machine_is_compatible ("PowerBook3,1" ) - ||machine_is_compatible ("PowerBook3,2" )) { +if (of_machine_is_compatible ("PowerBook3,1" ) + ||of_machine_is_compatible ("PowerBook3,2" )) {msleep (100 );snd_pmac_awacs_write_reg (chip,1 , chip->awacs_reg[1 ] & ~MASK_PAROUT );
@@ -780,16 +780,16 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip) }#endif /* CONFIG_PM */ -#define IS_PM7500 (machine_is_compatible("AAPL,7500") \ - || machine_is_compatible("AAPL,8500") \ - || machine_is_compatible("AAPL,9500")) -#define IS_PM5500 (machine_is_compatible("AAPL,e411")) -#define IS_BEIGE (machine_is_compatible("AAPL,Gossamer")) -#define IS_IMAC1 (machine_is_compatible("PowerMac2,1")) -#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \ - || machine_is_compatible("PowerMac4,1")) -#define IS_G4AGP (machine_is_compatible("PowerMac3,1")) -#define IS_LOMBARD (machine_is_compatible("PowerBook1,1")) +#define IS_PM7500 (of_machine_is_compatible("AAPL,7500") \ + || of_machine_is_compatible("AAPL,8500") \ + || of_machine_is_compatible("AAPL,9500")) +#define IS_PM5500 (of_machine_is_compatible("AAPL,e411")) +#define IS_BEIGE (of_machine_is_compatible("AAPL,Gossamer")) +#define IS_IMAC1 (of_machine_is_compatible("PowerMac2,1")) +#define IS_IMAC2 (of_machine_is_compatible("PowerMac2,2") \ + || of_machine_is_compatible("PowerMac4,1")) +#define IS_G4AGP (of_machine_is_compatible("PowerMac3,1")) +#define IS_LOMBARD (of_machine_is_compatible("PowerBook1,1"))static int imac1, imac2;
sound/ppc/burgundy.c +2 -2
@@ -582,7 +582,7 @@ static int snd_pmac_burgundy_detect_headphone(struct snd_pmac *chip)static void snd_pmac_burgundy_update_automute (struct snd_pmac *chip,int do_notify) {if (chip->auto_mute) { -int imac =machine_is_compatible ("iMac" ); +int imac =of_machine_is_compatible ("iMac" );int reg, oreg; reg = oreg =snd_pmac_burgundy_rcb (chip,MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES );
@@ -620,7 +620,7 @@ static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_noti*/ int __devinit snd_pmac_burgundy_init (struct snd_pmac *chip) { -int imac =machine_is_compatible ("iMac" ); +int imac =of_machine_is_compatible ("iMac" );int i, err;/* Checks to see the chip is alive and kicking */
sound/ppc/pmac.c +9 -9
@@ -922,11 +922,11 @@ static void __devinit detect_byte_swap(struct snd_pmac *chip) }/* it seems the Pismo & iBook can't byte-swap in hardware. */ -if (machine_is_compatible ("PowerBook3,1" ) || -machine_is_compatible ("PowerBook2,1" )) +if (of_machine_is_compatible ("PowerBook3,1" ) || +of_machine_is_compatible ("PowerBook2,1" )) chip->can_byte_swap =0 ; -if (machine_is_compatible ("PowerBook2,1" )) +if (of_machine_is_compatible ("PowerBook2,1" )) chip->can_duplex =0 ; }
@@ -959,11 +959,11 @@ static int __devinit snd_pmac_detect(struct snd_pmac *chip) chip->control_mask =MASK_IEPC |MASK_IEE |0x11 ;/* default */ /* check machine type */ -if (machine_is_compatible ("AAPL,3400/2400" ) - ||machine_is_compatible ("AAPL,3500" )) +if (of_machine_is_compatible ("AAPL,3400/2400" ) + ||of_machine_is_compatible ("AAPL,3500" )) chip->is_pbook_3400 =1 ; -else if (machine_is_compatible ("PowerBook1,1" ) - ||machine_is_compatible ("AAPL,PowerBook1998" )) +else if (of_machine_is_compatible ("PowerBook1,1" ) + ||of_machine_is_compatible ("AAPL,PowerBook1998" )) chip->is_pbook_G3 =1 ; chip->node =of_find_node_by_name (NULL ,"awacs" ); sound =of_node_get (chip->node);
@@ -1033,8 +1033,8 @@ static int __devinit snd_pmac_detect(struct snd_pmac *chip) }if (of_device_is_compatible (sound,"tumbler" )) { chip->model =PMAC_TUMBLER ; - chip->can_capture =machine_is_compatible ("PowerMac4,2" ) - ||machine_is_compatible ("PowerBook4,1" ); + chip->can_capture =of_machine_is_compatible ("PowerMac4,2" ) + ||of_machine_is_compatible ("PowerBook4,1" ); chip->can_duplex =0 ;// chip->can_byte_swap = 0; /* FIXME: check this */ chip->num_freqs =ARRAY_SIZE (tumbler_freqs);
sound/soc/fsl/efika-audio-fabric.c +1 -1
@@ -55,7 +55,7 @@ static __init int efika_fabric_init(void)struct platform_device *pdev;int rc; -if (!machine_is_compatible ("bplan,efika" )) +if (!of_machine_is_compatible ("bplan,efika" ))return -ENODEV ; card.platform = &mpc5200_audio_dma_platform;
sound/soc/fsl/pcm030-audio-fabric.c +1 -1
@@ -55,7 +55,7 @@ static __init int pcm030_fabric_init(void)struct platform_device *pdev;int rc; -if (!machine_is_compatible ("phytec,pcm030" )) +if (!of_machine_is_compatible ("phytec,pcm030" ))return -ENODEV ; card.platform = &mpc5200_audio_dma_platform;
PATCH 3/3 of/flattree: merge early_init_dt_scan_memory() common code
In reply to Grant LikelyMerge common code between PowerPC and Microblaze architectures.
---
arch/microblaze/kernel/prom.c | 51 +----------------------------- arch/powerpc/kernel/prom.c | 69 +++++++++++------------------------------ drivers/of/fdt.c | 50 ++++++++++++++++++++++++++++++ include/linux/of_fdt.h | 3 ++ 4 files changed, 73 insertions(+), 100 deletions(-)
arch/microblaze/kernel/prom.c +2 -49
@@ -45,61 +45,14 @@/* export that to outside world */ struct device_node *of_chosen; -#define early_init_dt_scan_drconf_memory (node) 0 -void __init early_init_dt_scan_chosen_arch (unsigned long node) {/* No Microblaze specific code here */ } -static int __init early_init_dt_scan_memory (unsigned long node, -const char *uname,int depth,void *data) +void __init early_init_dt_add_memory_arch (u64 base,u64 size) { -char *type =of_get_flat_dt_prop (node,"device_type" ,NULL ); -__be32 *reg, *endp; -unsigned long l; - -/* Look for the ibm,dynamic-reconfiguration-memory node */ -/* if (depth == 1 && -strcmp(uname, "ibm,dynamic-reconfiguration-memory") == 0) -return early_init_dt_scan_drconf_memory(node); -*/ -/* We are scanning "memory" nodes only */ -if (type ==NULL ) { -/* -* The longtrail doesn't have a device_type on the -* /memory node, so look for the node called /memory@0. -*/ -if (depth !=1 ||strcmp (uname,"memory@0" ) !=0 ) -return 0 ; - }else if (strcmp (type,"memory" ) !=0 ) -return 0 ; - - reg = (__be32 *)of_get_flat_dt_prop (node,"linux,usable-memory" , &l); -if (reg ==NULL ) - reg = (__be32 *)of_get_flat_dt_prop (node,"reg" , &l); -if (reg ==NULL ) -return 0 ; - - endp = reg + (l /sizeof (__be32)); - -pr_debug ("memory scan node %s, reg size %ld, data: %x %x %x %x,\n" , - uname, l, reg[0 ], reg[1 ], reg[2 ], reg[3 ]); - -while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) { -u64 base, size; - - base =dt_mem_next_cell (dt_root_addr_cells, ®); - size =dt_mem_next_cell (dt_root_size_cells, ®); - -if (size ==0 ) -continue ; -pr_debug (" - %llx , %llx\n" , (unsigned long long )base, - (unsigned long long )size); - -lmb_add (base, size); - } -return 0 ; +lmb_add (base, size); }#ifdef CONFIG_EARLY_PRINTK
arch/powerpc/kernel/prom.c +18 -51
89 lines not on this page · raw message
drivers/of/fdt.c +50 -0
62 lines not on this page · raw message
include/linux/of_fdt.h +3 -0
@@ -75,6 +75,9 @@ extern void early_init_dt_scan_chosen_arch(unsigned long node);extern int early_init_dt_scan_chosen (unsigned long node,const char *uname,int depth,void *data);extern void early_init_dt_check_for_initrd (unsigned long node); +extern int early_init_dt_scan_memory (unsigned long node,const char *uname, +int depth,void *data); +extern void early_init_dt_add_memory_arch (u64 base,u64 size);extern u64 dt_mem_next_cell (int s,u32 **cellp);/* Early flat tree scan hooks */
Hi Grant,
Quoted 4 lines · Grant Likely
Hi everyone. Here are a few patches that I've got sitting in my test-devicetree branch, but I haven't posted for review yet. Please take a look and let me know if they are okay. Once I've collected acks I'll move them over to my next-devicetree branch.
I am not able applied these patches on Linus head but I have tested your test-devicetree branch and I haven't found any problem for Microblaze, that's why you can add my ACK for Microblaze part
BTW: I am testing Stephen's next tree every day that's why if you add that patches to next-tree you can look at http://www.monstr.eu/wiki/doku.php?id=log:log
to see if is any problem on Microblaze or not.
Thanks,
Michal
Quoted 62 lines
Thanks,
g.---
Grant Likely (3):
of/flattree: mergeearly_init_dt_scan_memory()common code
of: add 'of_' prefix tomachine_is_compatible()
microblaze: removeearly_init_dt_scan_cpus()and phyp_dump_*()arch/microblaze/include/asm/prom.h | 4 arch/microblaze/kernel/prom.c | 284 ------------------------- arch/powerpc/include/asm/prom.h | 4 arch/powerpc/kernel/pci_64.c | 2 arch/powerpc/kernel/prom.c | 149 ++----------- arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 arch/powerpc/platforms/cell/cbe_powerbutton.c | 2 arch/powerpc/platforms/cell/ras.c | 2 arch/powerpc/platforms/pasemi/cpufreq.c | 4 arch/powerpc/platforms/powermac/cpufreq_32.c | 14 + arch/powerpc/platforms/powermac/cpufreq_64.c | 14 + arch/powerpc/platforms/powermac/feature.c | 2 arch/powerpc/platforms/powermac/smp.c | 12 + arch/powerpc/platforms/powermac/time.c | 8 - arch/powerpc/platforms/powermac/udbg_scc.c | 6 - arch/powerpc/sysdev/grackle.c | 4 arch/sparc/kernel/prom_common.c | 12 - drivers/char/hvc_beat.c | 2 drivers/gpu/drm/radeon/radeon_combios.c | 44 ++-- drivers/macintosh/adb.c | 4 drivers/macintosh/therm_pm72.c | 8 - drivers/macintosh/therm_windtunnel.c | 2 drivers/macintosh/via-pmu-backlight.c | 8 - drivers/macintosh/via-pmu.c | 8 - drivers/macintosh/windfarm_core.c | 6 - drivers/macintosh/windfarm_cpufreq_clamp.c | 6 - drivers/macintosh/windfarm_lm75_sensor.c | 6 - drivers/macintosh/windfarm_max6690_sensor.c | 6 - drivers/macintosh/windfarm_pm112.c | 2 drivers/macintosh/windfarm_pm121.c | 2 drivers/macintosh/windfarm_pm81.c | 4 drivers/macintosh/windfarm_pm91.c | 2 drivers/macintosh/windfarm_smu_sensors.c | 6 - drivers/net/mace.c | 2 drivers/of/Kconfig | 4 drivers/of/base.c | 98 ++++++++- drivers/of/fdt.c | 50 ++++ drivers/serial/pmac_zilog.c | 6 - drivers/video/aty/aty128fb.c | 14 + drivers/video/aty/atyfb_base.c | 8 - drivers/video/aty/radeon_backlight.c | 6 - include/linux/of.h | 6 + include/linux/of_fdt.h | 5 sound/ppc/awacs.c | 24 +- sound/ppc/burgundy.c | 4 sound/ppc/pmac.c | 18 +- sound/soc/fsl/efika-audio-fabric.c | 2 sound/soc/fsl/pcm030-audio-fabric.c | 2 48 files changed, 317 insertions(+), 575 deletions(-)
Signature · 4 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian