Skip to content

Commit ba99b75

Browse files
jianlonghuanglinusw
authored andcommitted
pinctrl: starfive: Rename "pinctrl-starfive" to "pinctrl-starfive-jh7100"
Add the SoC name to make it more clear. Also the next generation StarFive SoCs will use "pinctrl-starfive" as the core of StarFive pinctrl driver. No functional change. Signed-off-by: Jianlong Huang <[email protected]> Signed-off-by: Hal Feng <[email protected]> Reviewed-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent ba7fdf8 commit ba99b75

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ examples:
165165
- |
166166
#include <dt-bindings/clock/starfive-jh7100.h>
167167
#include <dt-bindings/reset/starfive-jh7100.h>
168-
#include <dt-bindings/pinctrl/pinctrl-starfive.h>
168+
#include <dt-bindings/pinctrl/pinctrl-starfive-jh7100.h>
169169
170170
soc {
171171
#address-cells = <2>;

arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "jh7100.dtsi"
99
#include <dt-bindings/gpio/gpio.h>
1010
#include <dt-bindings/leds/common.h>
11-
#include <dt-bindings/pinctrl/pinctrl-starfive.h>
11+
#include <dt-bindings/pinctrl/pinctrl-starfive-jh7100.h>
1212

1313
/ {
1414
model = "BeagleV Starlight Beta";

drivers/pinctrl/starfive/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
config PINCTRL_STARFIVE
3+
config PINCTRL_STARFIVE_JH7100
44
tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC"
55
depends on SOC_STARFIVE || COMPILE_TEST
66
depends on OF

drivers/pinctrl/starfive/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o
3+
obj-$(CONFIG_PINCTRL_STARFIVE_JH7100) += pinctrl-starfive-jh7100.o

drivers/pinctrl/starfive/pinctrl-starfive.c renamed to drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/pinctrl/pinctrl.h>
2121
#include <linux/pinctrl/pinmux.h>
2222

23-
#include <dt-bindings/pinctrl/pinctrl-starfive.h>
23+
#include <dt-bindings/pinctrl/pinctrl-starfive-jh7100.h>
2424

2525
#include "../core.h"
2626
#include "../pinctrl-utils.h"

include/dt-bindings/pinctrl/pinctrl-starfive.h renamed to include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Copyright (C) 2021 Emil Renner Berthing <[email protected]>
44
*/
55

6-
#ifndef __DT_BINDINGS_PINCTRL_STARFIVE_H__
7-
#define __DT_BINDINGS_PINCTRL_STARFIVE_H__
6+
#ifndef __DT_BINDINGS_PINCTRL_STARFIVE_JH7100_H__
7+
#define __DT_BINDINGS_PINCTRL_STARFIVE_JH7100_H__
88

99
#define PAD_GPIO_OFFSET 0
1010
#define PAD_FUNC_SHARE_OFFSET 64
@@ -272,4 +272,4 @@
272272

273273
#define GPI_NONE 0xff
274274

275-
#endif /* __DT_BINDINGS_PINCTRL_STARFIVE_H__ */
275+
#endif /* __DT_BINDINGS_PINCTRL_STARFIVE_JH7100_H__ */

0 commit comments

Comments
 (0)