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

Collapse All | Expand All

(-)a/drivers/pinctrl/pinctrl-rockchip.c (+78 lines)
Lines 635-645 static struct rockchip_mux_recalced_data rk3308_mux_recalced_data[] = { Link Here
635 

          635
          

        

        

          636
          
static struct rockchip_mux_recalced_data rk3328_mux_recalced_data[] = {

          636
          
static struct rockchip_mux_recalced_data rk3328_mux_recalced_data[] = {

        

        

          637
          
	{

          637
          
	{

        

            

              
              
              638
              
		.num = 2,

            

            

              639
              
		.pin = 8,

            

            

              640
              
		.reg = 0x24,

            

            

              641
              
		.bit = 0,

            

            

              642
              
		.mask = 0x3

            

            

              643
              
	}, {

            

            

              644
              
		.num = 2,

            

            

              645
              
		.pin = 9,

            

            

              646
              
		.reg = 0x24,

            

            

              647
              
		.bit = 2,

            

            

              648
              
		.mask = 0x3

            

            

              649
              
	}, {

            

            

              650
              
		.num = 2,

            

            

              651
              
		.pin = 10,

            

            

              652
              
		.reg = 0x24,

            

            

              653
              
		.bit = 4,

            

            

              654
              
		.mask = 0x3

            

            

              655
              
	}, {

            

            

              656
              
		.num = 2,

            

            

              657
              
		.pin = 11,

            

            

              658
              
		.reg = 0x24,

            

            

              659
              
		.bit = 6,

            

            

              660
              
		.mask = 0x3

            

            

              661
              
	}, {

            

        

          638
          
		.num = 2,

          662
          
		.num = 2,

        

        

          639
          
		.pin = 12,

          663
          
		.pin = 12,

        

        

          640
          
		.reg = 0x24,

          664
          
		.reg = 0x24,

        

        

          641
          
		.bit = 8,

          665
          
		.bit = 8,

        

        

          642
          
		.mask = 0x3

          666
          
		.mask = 0x3

        

            

              
              
              667
              
	}, {

            

            

              668
              
		.num = 2,

            

            

              669
              
		.pin = 13,

            

            

              670
              
		.reg = 0x24,

            

            

              671
              
		.bit = 10,

            

            

              672
              
		.mask = 0x3

            

            

              673
              
	}, {

            

            

              674
              
		.num = 2,

            

            

              675
              
		.pin = 14,

            

            

              676
              
		.reg = 0x24,

            

            

              677
              
		.bit = 12,

            

            

              678
              
		.mask = 0x3

            

        

          643
          
	}, {

          679
          
	}, {

        

        

          644
          
		.num = 2,

          680
          
		.num = 2,

        

        

          645
          
		.pin = 15,

          681
          
		.pin = 15,

        

  

    
      
            Lines 652-657
          static struct rockchip_mux_recalced_data rk3328_mux_recalced_data[] = {
      
      
        Link Here
      
    
  

        

          652
          
		.reg = 0x30,

          688
          
		.reg = 0x30,

        

        

          653
          
		.bit = 14,

          689
          
		.bit = 14,

        

        

          654
          
		.mask = 0x3

          690
          
		.mask = 0x3

        

            

              
              
              691
              
	}, {

            

            

              692
              
		.num = 3,

            

            

              693
              
		.pin = 9,

            

            

              694
              
		.reg = 0x44,

            

            

              695
              
		.bit = 2,

            

            

              696
              
		.mask = 0x3

            

            

              697
              
	}, {

            

            

              698
              
		.num = 3,

            

            

              699
              
		.pin = 10,

            

            

              700
              
		.reg = 0x44,

            

            

              701
              
		.bit = 4,

            

            

              702
              
		.mask = 0x3

            

            

              703
              
	}, {

            

            

              704
              
		.num = 3,

            

            

              705
              
		.pin = 11,

            

            

              706
              
		.reg = 0x44,

            

            

              707
              
		.bit = 6,

            

            

              708
              
		.mask = 0x3

            

            

              709
              
	}, {

            

            

              710
              
		.num = 3,

            

            

              711
              
		.pin = 12,

            

            

              712
              
		.reg = 0x44,

            

            

              713
              
		.bit = 8,

            

            

              714
              
		.mask = 0x3

            

            

              715
              
	}, {

            

            

              716
              
		.num = 3,

            

            

              717
              
		.pin = 13,

            

            

              718
              
		.reg = 0x44,

            

            

              719
              
		.bit = 10,

            

            

              720
              
		.mask = 0x3

            

            

              721
              
	}, {

            

            

              722
              
		.num = 3,

            

            

              723
              
		.pin = 14,

            

            

              724
              
		.reg = 0x44,

            

            

              725
              
		.bit = 12,

            

            

              726
              
		.mask = 0x3

            

            

              727
              
	}, {

            

            

              728
              
		.num = 3,

            

            

              729
              
		.pin = 15,

            

            

              730
              
		.reg = 0x44,

            

            

              731
              
		.bit = 14,

            

            

              732
              
		.mask = 0x3

            

        

          655
          
	},

          733
          
	},

        

        

          656
          
};

          734
          
};

        

        

          657
          

          735
          

        






  

  Return to bug 217334