1/5 powerpc: Rework PowerMac i2c part 1
Subsystems (3)
PATCH 1/1 1/5 powerpc: Rework PowerMac i2c part 1
This is the first part of a rework of the PowerMac i2c code. It completely reworks the "low_i2c" layer. It is now more flexible, supports KeyWest, SMU and PMU i2c busses, and provides functions to match device nodes to i2c busses and adapters.
This patch also extends & fix some bugs in the SMU driver related to i2c support and removes the clock spreading hacks from the pmac feature code rather than adapting them to the new API since they'll be replaced by the platform function code completely in patch 3/5
arch/powerpc/platforms/powermac/feature.c +0 -127
@@ -1677,124 +1677,6 @@ intrepid_shutdown(struct macio_chip *mac } -void pmac_tweak_clock_spreading (int enable) -{ -struct macio_chip *macio = &macio_chips[0 ]; - -/* Hack for doing clock spreading on some machines PowerBooks and -* iBooks. This implements the "platform-do-clockspreading" OF -* property as decoded manually on various models. For safety, we also -* check the product ID in the device-tree in cases we'll whack the i2c -* chip to make reasonably sure we won't set wrong values in there -* -* Of course, ultimately, we have to implement a real parser for -* the platform-do-* stuff... -*/ - -if (macio->type == macio_intrepid) { -struct device_node *clock = -of_find_node_by_path ("/uni-n@f8000000/hw-clock" ); -if (clock &&get_property (clock,"platform-do-clockspreading" , -NULL )) { -printk (KERN_INFO "%sabling clock spreading on Intrepid" -" ASIC\n" , enable ?"En" :"Dis" ); -if (enable) -UN_OUT (UNI_N_CLOCK_SPREADING ,2 ); -else -UN_OUT (UNI_N_CLOCK_SPREADING ,0 ); -mdelay (40 ); - } -of_node_put (clock); - } - -while (machine_is_compatible ("PowerBook5,2" ) || -machine_is_compatible ("PowerBook5,3" ) || -machine_is_compatible ("PowerBook6,2" ) || -machine_is_compatible ("PowerBook6,3" )) { -struct device_node *ui2c =of_find_node_by_type (NULL ,"i2c" ); -struct device_node *dt =of_find_node_by_name (NULL ,"device-tree" ); -u8 buffer[9 ]; -u32 *productID; -int i, rc, changed =0 ; - -if (dt ==NULL ) -break ; - productID = (u32 *)get_property (dt,"pid#" ,NULL ); -if (productID ==NULL ) -break ; -while (ui2c) { -struct device_node *p =of_get_parent (ui2c); -if (p && !strcmp (p->name,"uni-n" )) -break ; - ui2c =of_find_node_by_type (ui2c,"i2c" ); - } -if (ui2c ==NULL ) -break ; -DBG ("Trying to bump clock speed for PID: %08x...\n" , *productID); - rc =pmac_low_i2c_open (ui2c,1 ); -if (rc !=0 ) -break ; -pmac_low_i2c_setmode (ui2c, pmac_low_i2c_mode_combined); - rc =pmac_low_i2c_xfer (ui2c,0xd2 | pmac_low_i2c_read,0x80 , buffer,9 ); -DBG ("read result: %d," , rc); -if (rc !=0 ) { -pmac_low_i2c_close (ui2c); -break ; - } -for (i=0 ; i<9 ; i++) -DBG (" %02x" , buffer[i]); -DBG ("\n" ); - -switch (*productID) { -case 0x1182 :/* AlBook 12" rev 2 */ -case 0x1183 :/* iBook G4 12" */ - buffer[0 ] = (buffer[0 ] &0x8f ) |0x70 ; - buffer[2 ] = (buffer[2 ] &0x7f ) |0x00 ; - buffer[5 ] = (buffer[5 ] &0x80 ) |0x31 ; - buffer[6 ] = (buffer[6 ] &0x40 ) |0xb0 ; - buffer[7 ] = (buffer[7 ] &0x00 ) | (enable ?0xc0 :0xba ); - buffer[8 ] = (buffer[8 ] &0x00 ) |0x30 ; - changed =1 ; -break ; -case 0x3142 :/* AlBook 15" (ATI M10) */ -case 0x3143 :/* AlBook 17" (ATI M10) */ - buffer[0 ] = (buffer[0 ] &0xaf ) |0x50 ; - buffer[2 ] = (buffer[2 ] &0x7f ) |0x00 ; - buffer[5 ] = (buffer[5 ] &0x80 ) |0x31 ; - buffer[6 ] = (buffer[6 ] &0x40 ) |0xb0 ; - buffer[7 ] = (buffer[7 ] &0x00 ) | (enable ?0xd0 :0xc0 ); - buffer[8 ] = (buffer[8 ] &0x00 ) |0x30 ; - changed =1 ; -break ; -default : -DBG ("i2c-hwclock: Machine model not handled\n" ); -break ; - } -if (!changed) { -pmac_low_i2c_close (ui2c); -break ; - } -printk (KERN_INFO "%sabling clock spreading on i2c clock chip\n" , - enable ?"En" :"Dis" ); - -pmac_low_i2c_setmode (ui2c, pmac_low_i2c_mode_stdsub); - rc =pmac_low_i2c_xfer (ui2c,0xd2 | pmac_low_i2c_write,0x80 , buffer,9 ); -DBG ("write result: %d," , rc); -pmac_low_i2c_setmode (ui2c, pmac_low_i2c_mode_combined); - rc =pmac_low_i2c_xfer (ui2c,0xd2 | pmac_low_i2c_read,0x80 , buffer,9 ); -DBG ("read result: %d," , rc); -if (rc !=0 ) { -pmac_low_i2c_close (ui2c); -break ; - } -for (i=0 ; i<9 ; i++) -DBG (" %02x" , buffer[i]); -pmac_low_i2c_close (ui2c); -break ; - } -} - -static int core99_sleep (void ) {
@@ -2980,12 +2862,6 @@ set_initial_features(void) MACIO_BIC(HEATHROW_FCR, HRW_SOUND_POWER_N); } -/* Some machine models need the clock chip to be properly setup for -* clock spreading now. This should be a platform function but we -* don't do these at the moment -*/ -pmac_tweak_clock_spreading (1 ); -#endif /* CONFIG_POWER4 */ /* On all machines, switch modem & serial ports off */
@@ -3013,9 +2889,6 @@ pmac_feature_init(void)return ; } -/* Setup low-level i2c stuffs */ -pmac_init_low_i2c (); -/* Probe machine type */ if (probe_motherboard ())printk (KERN_WARNING "Unknown PowerMac !\n" );
arch/powerpc/platforms/powermac/low_i2c.c +683 -170
1,071 lines not on this page · raw message
include/asm-powerpc/pmac_low_i2c.h +71 -14
101 lines not on this page · raw message
arch/powerpc/platforms/powermac/smp.c +38 -37
143 lines not on this page · raw message
drivers/macintosh/via-pmu.c +1 -263
300 lines not on this page · raw message
include/asm-powerpc/pmac_feature.h +0 -4
@@ -318,10 +318,6 @@ extern void pmac_register_agp_pm(structextern void pmac_suspend_agp_for_card (struct pci_dev *dev);extern void pmac_resume_agp_for_card (struct pci_dev *dev); -/* Used by the via-pmu driver for suspend/resume -*/ -extern void pmac_tweak_clock_spreading (int enable); -/* * The part below is for use by macio_asic.c only, do not rely * on the data structures or constants below in a normal driver
include/linux/pmu.h +1 -7
@@ -140,7 +140,7 @@ extern int find_via_pmu(void);extern int pmu_request (struct adb_request *req,void (*done)(struct adb_request *),int nbytes, ...); - +extern int pmu_queue_request (struct adb_request *req);extern void pmu_poll (void );extern void pmu_poll_adb (void );/* For use by xmon */ extern void pmu_wait_complete (struct adb_request *req);
@@ -160,12 +160,6 @@ extern void pmu_unlock(void);extern int pmu_present (void );extern int pmu_get_model (void ); -extern int pmu_i2c_combined_read (int bus,int addr,int subaddr,u8 * data,int len); -extern int pmu_i2c_stdsub_write (int bus,int addr,int subaddr,u8 * data,int len); -extern int pmu_i2c_simple_read (int bus,int addr,u8 * data,int len); -extern int pmu_i2c_simple_write (int bus,int addr,u8 * data,int len); - -#ifdef CONFIG_PM /* * Stuff for putting the powerbook to sleep and waking it again.
arch/powerpc/platforms/powermac/setup.c +9 -14
@@ -658,27 +658,22 @@ static int __init pmac_declare_of_platfo {struct device_node *np, *npp; - np =find_devices ("uni-n" ); -if (np) { -for (np = np->child; np !=NULL ; np = np->sibling) -if (strncmp (np->name,"i2c" ,3 ) ==0 ) { -of_platform_device_create (np,"uni-n-i2c" , -NULL ); -break ; - } - } - np =find_devices ("valkyrie" ); + np =of_find_node_by_name (NULL ,"valkyrie" );if (np)of_platform_device_create (np,"valkyrie" ,NULL ); - np =find_devices ("platinum" ); + np =of_find_node_by_name (NULL ,"platinum" );if (np)of_platform_device_create (np,"platinum" ,NULL ); - - npp =of_find_node_by_name (NULL ,"u3" ); + npp =of_find_node_by_name (NULL ,"uni-n" ); +if (npp ==NULL ) + npp =of_find_node_by_name (NULL ,"u3" ); +if (npp ==NULL ) + npp =of_find_node_by_name (NULL ,"u4" );if (npp) {for (np =NULL ; (np =of_get_next_child (npp, np)) !=NULL ;) {if (strncmp (np->name,"i2c" ,3 ) ==0 ) { -of_platform_device_create (np,"u3-i2c" ,NULL ); +of_platform_device_create (np,"uni-n-i2c" , +NULL );of_node_put (np);break ; }
drivers/i2c/busses/i2c-pmac-smu.c +13 -4
@@ -103,8 +103,8 @@ static s32 smu_smbus_xfer( struct i2c_ad cmd.info.subaddr[1 ] =0 ; cmd.info.subaddr[2 ] =0 ;if (!read) { - cmd.info.data[0 ] = data->byte &0xff ; - cmd.info.data[1 ] = (data->byte >>8 ) &0xff ; + cmd.info.data[0 ] = data->word &0xff ; + cmd.info.data[1 ] = (data->word >>8 ) &0xff ; }break ;/* Note that these are broken vs. the expected smbus API where
@@ -116,7 +116,7 @@ static s32 smu_smbus_xfer( struct i2c_adcase I2C_SMBUS_BLOCK_DATA : cmd.info.type =SMU_I2C_TRANSFER_STDSUB ; cmd.info.datalen = data->block[0 ] +1 ; -if (cmd.info.datalen >6 ) +if (cmd.info.datalen > (SMU_I2C_WRITE_MAX +1 ))return -EINVAL ;if (!read)memcpy (cmd.info.data, data->block, cmd.info.datalen);
@@ -273,7 +273,13 @@ static int dispose_iface(struct device *static int create_iface_of_platform (struct of_device * dev,const struct of_device_id *match) { -return create_iface (dev->node, &dev->dev); +struct device_node *node = dev->node; + +if (device_is_compatible (node,"smu-i2c" ) || + (node->parent !=NULL && +device_is_compatible (node->parent,"smu-i2c-control" ))) +return create_iface (node, &dev->dev); +return -ENODEV ; }
@@ -288,6 +294,9 @@ static struct of_device_id i2c_smu_match { .compatible = "smu-i2c", }, + { + .compatible = "i2c-bus", + }, {}, }; static struct of_platform_driver i2c_smu_of_platform_driver =
drivers/macintosh/smu.c +37 -21
121 lines not on this page · raw message
include/asm-powerpc/smu.h +6 -6
@@ -358,6 +358,9 @@ extern unsigned long smu_cmdbuf_abs;* Kenrel asynchronous i2c interface */ +#define SMU_I2C_READ_MAX 0x1d +#define SMU_I2C_WRITE_MAX 0x15 +/* SMU i2c header, exactly matches i2c header on wire */ struct smu_i2c_param {
@@ -368,12 +371,9 @@ struct smu_i2c_paramu8 subaddr[3 ];/* subaddress */ u8 caddr;/* combined address, filled by SMU driver */ u8 datalen;/* length of transfer */ -u8 data[7 ];/* data */ +u8 data[SMU_I2C_READ_MAX ];/* data */ }; -#define SMU_I2C_READ_MAX 0x0d -#define SMU_I2C_WRITE_MAX 0x05 -struct smu_i2c_cmd {/* public */
@@ -387,7 +387,7 @@ struct smu_i2c_cmdint read;int stage;int retries; -u8 pdata[0x10 ]; +u8 pdata[32 ];struct list_head link; };
@@ -519,7 +519,7 @@ struct smu_sdbp_cpupiddata {* if not found. The data format is described below */ extern struct smu_sdbp_header *smu_get_sdb_partition (int id, -unsigned int *size); +unsigned int *size);#endif /* __KERNEL__ */