Commit 8440ffcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:

 - Compilation fix for Sunplus sp7021

 - Add some missing headers after a cleanup to the Nomadik driver

 - Fix pull type and mux routes on Rockchip RK3568

* tag 'pinctrl-v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: rockchip: fix mux route data for rk3568
  pinctrl: rockchip: fix reading pull type on rk3568
  pinctrl: nomadik: Add missing header(s)
  pinctrl: sp7021: fix unused function warning
parents 8974efaa 431d1531

drivers/pinctrl/nomadik/pinctrl-ab8500.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,9 +6,10 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/gpio/driver.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinctrl.h>



#include <linux/mfd/abx500/ab8500.h>

#include <linux/mfd/abx500/ab8500.h>



#include "pinctrl-abx500.h"

#include "pinctrl-abx500.h"





/* All the pins that can be used for GPIO and some other functions */

/* All the pins that can be used for GPIO and some other functions */

drivers/pinctrl/nomadik/pinctrl-ab8505.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,9 +6,10 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/gpio/driver.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinctrl.h>



#include <linux/mfd/abx500/ab8500.h>

#include <linux/mfd/abx500/ab8500.h>



#include "pinctrl-abx500.h"

#include "pinctrl-abx500.h"





/* All the pins that can be used for GPIO and some other functions */

/* All the pins that can be used for GPIO and some other functions */

drivers/pinctrl/nomadik/pinctrl-abx500.c

+18 −14
Original line number Original line Diff line number Diff line
@@ -6,33 +6,37 @@ 
 *

 *

 * Driver allows to use AxB5xx unused pins to be used as GPIO

 * Driver allows to use AxB5xx unused pins to be used as GPIO

 */

 */

#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/types.h>

#include <linux/slab.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/gpio/driver.h>

#include <linux/gpio/driver.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/irqdomain.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/types.h>



#include <linux/mfd/abx500.h>

#include <linux/mfd/abx500.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/pinctrl/pinctrl.h>



#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/pinmux.h>

#include <linux/pinctrl/pinconf.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/pinctrl/pinconf.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinmux.h>





#include "pinctrl-abx500.h"

#include "../core.h"

#include "../core.h"

#include "../pinconf.h"

#include "../pinconf.h"

#include "../pinctrl-utils.h"

#include "../pinctrl-utils.h"





#include "pinctrl-abx500.h"



/*

/*

 * GPIO registers offset

 * GPIO registers offset

 * Bank: 0x10

 * Bank: 0x10

drivers/pinctrl/nomadik/pinctrl-abx500.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,10 @@ 
#ifndef PINCTRL_PINCTRL_ABx500_H

#ifndef PINCTRL_PINCTRL_ABx500_H

#define PINCTRL_PINCTRL_ABx500_H

#define PINCTRL_PINCTRL_ABx500_H





#include <linux/types.h>



struct pinctrl_pin_desc;



/* Package definitions */

/* Package definitions */

#define PINCTRL_AB8500	0

#define PINCTRL_AB8500	0

#define PINCTRL_AB8505	1

#define PINCTRL_AB8505	1

drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c

+3 −0
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: GPL-2.0

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/types.h>



#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinctrl.h>



#include "pinctrl-nomadik.h"

#include "pinctrl-nomadik.h"





/* All the pins that can be used for GPIO and some other functions */

/* All the pins that can be used for GPIO and some other functions */