View | Details | Raw Unified | Return to bug 6471 | Differences between
and this patch

Collapse All | Expand All

(-)sky2.orig/drivers/net/sky2.c (+1 lines)
Lines 236-241 Link Here
236 
		}
 236 
		}
237 

          237
          

        

        

          238
          
		if (hw->chip_id == CHIP_ID_YUKON_EC_U) {

          238
          
		if (hw->chip_id == CHIP_ID_YUKON_EC_U) {

        

            

              
              
              239
              
			sky2_write16(hw, B0_CTST, Y2_HW_WOL_ON);

            

        

          239
          
			sky2_pci_write32(hw, PCI_DEV_REG3, 0);

          240
          
			sky2_pci_write32(hw, PCI_DEV_REG3, 0);

        

        

          240
          
			reg1 = sky2_pci_read32(hw, PCI_DEV_REG4);

          241
          
			reg1 = sky2_pci_read32(hw, PCI_DEV_REG4);

        

        

          241
          
			reg1 &= P_ASPM_CONTROL_MSK;

          242
          
			reg1 &= P_ASPM_CONTROL_MSK;

        



(-)sky2.orig/drivers/net/sky2.h
      (+2 lines)




  

    
      
            Lines 175-180
          
      
      
        Link Here
      
    
  

        

          175
          
enum {

          175
          
enum {

        

        

          176
          
	Y2_VMAIN_AVAIL	= 1<<17,/* VMAIN available (YUKON-2 only) */

          176
          
	Y2_VMAIN_AVAIL	= 1<<17,/* VMAIN available (YUKON-2 only) */

        

        

          177
          
	Y2_VAUX_AVAIL	= 1<<16,/* VAUX available (YUKON-2 only) */

          177
          
	Y2_VAUX_AVAIL	= 1<<16,/* VAUX available (YUKON-2 only) */

        

            

              
              
              178
              
	Y2_HW_WOL_ON	= 1<<15,/* HW WOL On  (Yukon-EC Ultra A1 only) */

            

            

              179
              
	Y2_HW_WOL_OFF	= 1<<14,/* HW WOL On  (Yukon-EC Ultra A1 only) */

            

        

          178
          
	Y2_ASF_ENABLE	= 1<<13,/* ASF Unit Enable (YUKON-2 only) */

          180
          
	Y2_ASF_ENABLE	= 1<<13,/* ASF Unit Enable (YUKON-2 only) */

        

        

          179
          
	Y2_ASF_DISABLE	= 1<<12,/* ASF Unit Disable (YUKON-2 only) */

          181
          
	Y2_ASF_DISABLE	= 1<<12,/* ASF Unit Disable (YUKON-2 only) */

        

        

          180
          
	Y2_CLK_RUN_ENA	= 1<<11,/* CLK_RUN Enable  (YUKON-2 only) */

          182
          
	Y2_CLK_RUN_ENA	= 1<<11,/* CLK_RUN Enable  (YUKON-2 only) */

        






  

  Return to bug 6471