Skip to contentSkip to conversation

Rename RK1108 to RV1108

PATCH Applied Andy Yan 5 participants 24 messages Feb 13, 2017 – Mar 14, 2017

Subsystems (7)
lore
Share & tools
lore

Andy Yan

author
#0 lore raw

cover Rename RK1108 to RV1108

Rockchip finally named this soc as RV1108, so change RK1108/rk1108 to RV1108/rv1108 for compatible.

Andy Yan (7):
dt-bindings: rockchip-dw-mshc: rename RK1108 to RV1108
dt-bindings: rk1108-cru: rename RK1108 to RV1108
clk: rockchip: rename RK1108 to RV1108
dt-bindings: rockchip,pinctrl: rename RK1108 to RV1108
pinctrl: rockchip: rename RK1108 to RV1108
ARM: dts: rename RK1108 to RV1108
ARM: rockchip: reanme RK1108 to RV1108

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +-
 ...chip,rk1108-cru.txt => rockchip,rv1108-cru.txt} |  12 +-
 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   2 +-
 .../bindings/pinctrl/rockchip,pinctrl.txt          |  16 +-
 arch/arm/boot/dts/Makefile                         |   2 +-
 .../boot/dts/{rk1108-evb.dts => rv1108-evb.dts}    |   7 +-
 arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi}     |  24 +-
 drivers/clk/rockchip/Makefile                      |   2 +-
 .../clk/rockchip/{clk-rk1108.c => clk-rv1108.c}    | 414 ++++++++++-----------
 drivers/clk/rockchip/clk.h                         |  28 +-
 drivers/pinctrl/pinctrl-rockchip.c                 |  76 ++--
 .../clock/{rk1108-cru.h => rv1108-cru.h}           |   6 +-
 12 files changed, 300 insertions(+), 293 deletions(-)
 rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt} (83%)
 rename arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} (89%)
 rename arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} (94%)
 rename drivers/clk/rockchip/{clk-rk1108.c => clk-rv1108.c} (57%)
 rename include/dt-bindings/clock/{rk1108-cru.h => rv1108-cru.h} (97%)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/7 dt-bindings: rockchip-dw-mshc: rename RK1108 to RV1108

Rockchip finally named the SOC as RV1108, so change it.

---

 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt +1 -1
index ea9c1c9..520d61d 100644
@@ -13,7 +13,7 @@ Required Properties:
 	- "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following,
 							before RK3288
 	- "rockchip,rk3288-dw-mshc": for Rockchip RK3288
-	- "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK1108
+	- "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RV1108
 	- "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036
 	- "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368
 	- "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399
Signature · 1 line
2.7.4
#2 lore raw

Re: [PATCH 1/7] dt-bindings: rockchip-dw-mshc: rename RK1108 to RV1108

Quoted 23 lines · Andy Yan

Rockchip finally named the SOC as RV1108, so change it.

---

 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt +1 -2
index ea9c1c9..520d61d 100644
@@ -13,7 +13,7 @@ Required Properties:
        - "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following,
                                                        before RK3288
        - "rockchip,rk3288-dw-mshc": for Rockchip RK3288
-       - "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK1108
+       - "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RV1108
        - "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036
        - "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368
        - "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399
--
Quoted 3 lines

2.7.4

Seems like we didn't really start to use the previous compatible string, so I am fine with changing this. Anyway, I need an ack from Rob.

Kind regards
Uffe

maintainer
#4 lore raw

Re: [PATCH 1/7] dt-bindings: rockchip-dw-mshc: rename RK1108 to RV1108

Hi Rob,

Am Dienstag, 21. Februar 2017, 17:36:05 CET schrieb Rob Herring:

Quoted 11 lines · Andy Yan
Quoted 8 lines

Rockchip finally named the SOC as RV1108, so change it.

---

 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

does this Ack span to all dt-centric patches in this series?

As stated in some other mail, should be safe, as the soc isn't on the market yet.

Thanks
Heiko

Applied
#6 lore raw

Re: [PATCH 1/7] dt-bindings: rockchip-dw-mshc: rename RK1108 to RV1108

In reply to Andy Yan
Quoted 3 lines · Andy Yan

Rockchip finally named the SOC as RV1108, so change it.

Thanks, applied for fixes!

Kind regards
Uffe

Quoted 27 lines

---

 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt +1 -2
index ea9c1c9..520d61d 100644
@@ -13,7 +13,7 @@ Required Properties:
        - "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following,
                                                        before RK3288
        - "rockchip,rk3288-dw-mshc": for Rockchip RK3288
-       - "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK1108
+       - "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RV1108
        - "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036
        - "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368
        - "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399
--

2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#7 lore raw

PATCH 2/7 dt-bindings: rk1108-cru: rename RK1108 to RV1108

In reply to Andy Yan

Rockchip finally named the SOC as RV1108, so change it.

---

 .../{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt}     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt} (83%)
Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt renamed from Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt +6 -6
similarity index 83%
rename from Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt
rename to Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt
index 4da1261..161326a 100644
@@ -1,12 +1,12 @@
-* Rockchip RK1108 Clock and Reset Unit
+* Rockchip RV1108 Clock and Reset Unit
 
-The RK1108 clock controller generates and supplies clock to various
+The RV1108 clock controller generates and supplies clock to various
 controllers within the SoC and also implements a reset controller for SoC
 peripherals.
 
 Required Properties:
 
-- compatible: should be "rockchip,rk1108-cru"
+- compatible: should be "rockchip,rv1108-cru"
 - reg: physical base address of the controller and length of memory mapped
   region.
 - #clock-cells: should be 1.
@@ -19,7 +19,7 @@ Optional Properties:
 
 Each clock is assigned an identifier and client nodes can use this identifier
 to specify the clock which they consume. All available clocks are defined as
-preprocessor macros in the dt-bindings/clock/rk1108-cru.h headers and can be
+preprocessor macros in the dt-bindings/clock/rv1108-cru.h headers and can be
 used in device tree sources. Similar macros exist for the reset sources in
 these files.
 
@@ -38,7 +38,7 @@ clock-output-names:
 Example: Clock controller node:
 
 	cru: cru at 20200000 {
-		compatible = "rockchip,rk1108-cru";
+		compatible = "rockchip,rv1108-cru";
 		reg = <0x20200000 0x1000>;
 		rockchip,grf = <&grf>;
 
@@ -50,7 +50,7 @@ Example: UART controller node that consumes the clock generated by the clock
   controller:
 
 	uart0: serial at 10230000 {
-		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";
+		compatible = "rockchip,rv1108-uart", "snps,dw-apb-uart";
 		reg = <0x10230000 0x100>;
 		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
Signature · 1 line
2.7.4
maintainer Acked-by on v1 2/7
#8 lore raw

Re: [PATCH 2/7] dt-bindings: rk1108-cru: rename RK1108 to RV1108

Quoted 8 lines · Andy Yan

Rockchip finally named the SOC as RV1108, so change it.

---

 .../{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt}     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt} (83%)
author
#9 lore raw

PATCH 3/7 clk: rockchip: rename RK1108 to RV1108

In reply to Andy Yan

Rockchip finally named the SOC as RV1108, so change it.

---

 drivers/clk/rockchip/Makefile                      |   2 +-
 .../clk/rockchip/{clk-rk1108.c => clk-rv1108.c}    | 414 ++++++++++-----------
 drivers/clk/rockchip/clk.h                         |  28 +-
 .../clock/{rk1108-cru.h => rv1108-cru.h}           |   6 +-
 4 files changed, 225 insertions(+), 225 deletions(-)
 rename drivers/clk/rockchip/{clk-rk1108.c => clk-rv1108.c} (57%)
 rename include/dt-bindings/clock/{rk1108-cru.h => rv1108-cru.h} (97%)
drivers/clk/rockchip/Makefile +1 -1
index 16e098c..c745ee9 100644
@@ -11,7 +11,7 @@ obj-y	+= clk-mmc-phase.o
 obj-y	+= clk-ddr.o
 obj-$(CONFIG_RESET_CONTROLLER)	+= softrst.o
 
-obj-y	+= clk-rk1108.o
+obj-y	+= clk-rv1108.o
 obj-y	+= clk-rk3036.o
 obj-y	+= clk-rk3188.o
 obj-y	+= clk-rk3228.o
drivers/clk/rockchip/clk-rv1108.c renamed from drivers/clk/rockchip/clk-rk1108.c +207 -207

639 lines not on this page · raw message

drivers/clk/rockchip/clk.h +14 -14
index d67eecc..752a0f3 100644
@@ -34,20 +34,20 @@ struct clk;
 #define HIWORD_UPDATE(val, mask, shift) \
 		((val) << (shift) | (mask) << ((shift) + 16))
 
-/* register positions shared by RK1108, RK2928, RK3036, RK3066, RK3188 and RK3228 */
-#define RK1108_PLL_CON(x)		((x) * 0x4)
-#define RK1108_CLKSEL_CON(x)		((x) * 0x4 + 0x60)
-#define RK1108_CLKGATE_CON(x)		((x) * 0x4 + 0x120)
-#define RK1108_SOFTRST_CON(x)		((x) * 0x4 + 0x180)
-#define RK1108_GLB_SRST_FST		0x1c0
-#define RK1108_GLB_SRST_SND		0x1c4
-#define RK1108_MISC_CON			0x1cc
-#define RK1108_SDMMC_CON0		0x1d8
-#define RK1108_SDMMC_CON1		0x1dc
-#define RK1108_SDIO_CON0		0x1e0
-#define RK1108_SDIO_CON1		0x1e4
-#define RK1108_EMMC_CON0		0x1e8
-#define RK1108_EMMC_CON1		0x1ec
+/* register positions shared by RV1108, RK2928, RK3036, RK3066, RK3188 and RK3228 */
+#define RV1108_PLL_CON(x)		((x) * 0x4)
+#define RV1108_CLKSEL_CON(x)		((x) * 0x4 + 0x60)
+#define RV1108_CLKGATE_CON(x)		((x) * 0x4 + 0x120)
+#define RV1108_SOFTRST_CON(x)		((x) * 0x4 + 0x180)
+#define RV1108_GLB_SRST_FST		0x1c0
+#define RV1108_GLB_SRST_SND		0x1c4
+#define RV1108_MISC_CON			0x1cc
+#define RV1108_SDMMC_CON0		0x1d8
+#define RV1108_SDMMC_CON1		0x1dc
+#define RV1108_SDIO_CON0		0x1e0
+#define RV1108_SDIO_CON1		0x1e4
+#define RV1108_EMMC_CON0		0x1e8
+#define RV1108_EMMC_CON1		0x1ec
 
 #define RK2928_PLL_CON(x)		((x) * 0x4)
 #define RK2928_MODE_CON		0x40
include/dt-bindings/clock/rv1108-cru.h renamed from include/dt-bindings/clock/rk1108-cru.h +3 -3
similarity index 97%
rename from include/dt-bindings/clock/rk1108-cru.h
rename to include/dt-bindings/clock/rv1108-cru.h
index 9350a55..ae26f81 100644
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK1108_H
-#define _DT_BINDINGS_CLK_ROCKCHIP_RK1108_H
+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RV1108_H
+#define _DT_BINDINGS_CLK_ROCKCHIP_RV1108_H
 
 /* pll id */
 #define PLL_APLL			0
@@ -266,4 +266,4 @@
 #define ARST_DSP_EDP_PERF		184
 #define ARST_DSP_EPP_PERF		185
 
-#endif /* _DT_BINDINGS_CLK_ROCKCHIP_RK1108_H */
+#endif /* _DT_BINDINGS_CLK_ROCKCHIP_RV1108_H */
Signature · 1 line
2.7.4
author
#10 lore raw

PATCH 4/7 dt-bindings: rockchip,pinctrl: rename RK1108 to RV1108

In reply to Andy Yan

Rockchip finally named the SOC as RV1108, so change it. Also move the compatible list to one compatible per line.

---

 .../devicetree/bindings/pinctrl/rockchip,pinctrl.txt     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +11 -5
index 4722bc6..a4f3ef2 100644
@@ -19,11 +19,17 @@ The pins are grouped into up to 5 individual pin banks which need to be
 defined as gpio sub-nodes of the pinmux controller.
 
 Required properties for iomux controller:
-  - compatible: one of "rockchip,rk1108-pinctrl", "rockchip,rk2928-pinctrl"
-		       "rockchip,rk3066a-pinctrl", "rockchip,rk3066b-pinctrl"
-		       "rockchip,rk3188-pinctrl", "rockchip,rk3228-pinctrl"
-		       "rockchip,rk3288-pinctrl", "rockchip,rk3368-pinctrl"
-		       "rockchip,rk3399-pinctrl"
+  - compatible: should be
+		"rockchip,rv1108-pinctrl":  for Rockchip RV1108
+		"rockchip,rk2928-pinctrl":  for Rockchip RK2928
+		"rockchip,rk3066a-pinctrl": for Rockchip RK3066a
+		"rockchip,rk3066b-pinctrl": for Rockchip RK3066b
+		"rockchip,rk3188-pinctrl":  for Rockchip RK3188
+		"rockchip,rk3228-pinctrl":  for Rockchip RK3228
+		"rockchip,rk3288-pinctrl":  for Rockchip RK3288
+		"rockchip,rk3368-pinctrl":  for Rockchip RK3368
+		"rockchip,rk3399-pinctrl":  for Rockchip RK3399
+
   - rockchip,grf: phandle referencing a syscon providing the
 	 "general register files"
 
Signature · 1 line
2.7.4
maintainer Acked-by on v1 4/7
#11 lore raw

Re: [PATCH 4/7] dt-bindings: rockchip,pinctrl: rename RK1108 to RV1108

Quoted 8 lines · Andy Yan

Rockchip finally named the SOC as RV1108, so change it. Also move the compatible list to one compatible per line.

---

 .../devicetree/bindings/pinctrl/rockchip,pinctrl.txt     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
#13 lore raw

Re: [PATCH 4/7] dt-bindings: rockchip,pinctrl: rename RK1108 to RV1108

In reply to Andy Yan
Quoted 4 lines · Andy Yan

Rockchip finally named the SOC as RV1108, so change it. Also move the compatible list to one compatible per line.

This does not apply on my v4.11-rc1-based tree.

Please rebase and resend all patches you want me to merge, include any ACKs from Rob, Heiko etc.

Yours,
Linus Walleij

author
#14 lore raw

PATCH 5/7 pinctrl: rockchip: rename RK1108 to RV1108

In reply to Andy Yan

Rockchip finally named the SOC as RV1108, so change it.

---

 drivers/pinctrl/pinctrl-rockchip.c | 76 +++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 38 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +38 -38
index 08765f5..d7f1f9a 100644
@@ -59,7 +59,7 @@
 #define GPIO_LS_SYNC		0x60
 
 enum rockchip_pinctrl_type {
-	RK1108,
+	RV1108,
 	RK2928,
 	RK3066B,
 	RK3188,
@@ -625,13 +625,13 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
 	return ret;
 }
 
-#define RK1108_PULL_PMU_OFFSET		0x10
-#define RK1108_PULL_OFFSET		0x110
-#define RK1108_PULL_PINS_PER_REG	8
-#define RK1108_PULL_BITS_PER_PIN	2
-#define RK1108_PULL_BANK_STRIDE		16
+#define RV1108_PULL_PMU_OFFSET		0x10
+#define RV1108_PULL_OFFSET		0x110
+#define RV1108_PULL_PINS_PER_REG	8
+#define RV1108_PULL_BITS_PER_PIN	2
+#define RV1108_PULL_BANK_STRIDE		16
 
-static void rk1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
+static void rv1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 					 int pin_num, struct regmap **regmap,
 					 int *reg, u8 *bit)
 {
@@ -640,27 +640,27 @@ static void rk1108_calc_pull_reg_and_bit(struct rockchip_pin_bank *bank,
 	/* The first 24 pins of the first bank are located in PMU */
 	if (bank->bank_num == 0) {
 		*regmap = info->regmap_pmu;
-		*reg = RK1108_PULL_PMU_OFFSET;
+		*reg = RV1108_PULL_PMU_OFFSET;
 	} else {
-		*reg = RK1108_PULL_OFFSET;
+		*reg = RV1108_PULL_OFFSET;
 		*regmap = info->regmap_base;
 		/* correct the offset, as we're starting with the 2nd bank */
 		*reg -= 0x10;
-		*reg += bank->bank_num * RK1108_PULL_BANK_STRIDE;
+		*reg += bank->bank_num * RV1108_PULL_BANK_STRIDE;
 	}
 
-	*reg += ((pin_num / RK1108_PULL_PINS_PER_REG) * 4);
-	*bit = (pin_num % RK1108_PULL_PINS_PER_REG);
-	*bit *= RK1108_PULL_BITS_PER_PIN;
+	*reg += ((pin_num / RV1108_PULL_PINS_PER_REG) * 4);
+	*bit = (pin_num % RV1108_PULL_PINS_PER_REG);
+	*bit *= RV1108_PULL_BITS_PER_PIN;
 }
 
-#define RK1108_DRV_PMU_OFFSET		0x20
-#define RK1108_DRV_GRF_OFFSET		0x210
-#define RK1108_DRV_BITS_PER_PIN		2
-#define RK1108_DRV_PINS_PER_REG		8
-#define RK1108_DRV_BANK_STRIDE		16
+#define RV1108_DRV_PMU_OFFSET		0x20
+#define RV1108_DRV_GRF_OFFSET		0x210
+#define RV1108_DRV_BITS_PER_PIN		2
+#define RV1108_DRV_PINS_PER_REG		8
+#define RV1108_DRV_BANK_STRIDE		16
 
-static void rk1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
+static void rv1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
 					int pin_num, struct regmap **regmap,
 					int *reg, u8 *bit)
 {
@@ -669,19 +669,19 @@ static void rk1108_calc_drv_reg_and_bit(struct rockchip_pin_bank *bank,
 	/* The first 24 pins of the first bank are located in PMU */
 	if (bank->bank_num == 0) {
 		*regmap = info->regmap_pmu;
-		*reg = RK1108_DRV_PMU_OFFSET;
+		*reg = RV1108_DRV_PMU_OFFSET;
 	} else {
 		*regmap = info->regmap_base;
-		*reg = RK1108_DRV_GRF_OFFSET;
+		*reg = RV1108_DRV_GRF_OFFSET;
 
 		/* correct the offset, as we're starting with the 2nd bank */
 		*reg -= 0x10;
-		*reg += bank->bank_num * RK1108_DRV_BANK_STRIDE;
+		*reg += bank->bank_num * RV1108_DRV_BANK_STRIDE;
 	}
 
-	*reg += ((pin_num / RK1108_DRV_PINS_PER_REG) * 4);
-	*bit = pin_num % RK1108_DRV_PINS_PER_REG;
-	*bit *= RK1108_DRV_BITS_PER_PIN;
+	*reg += ((pin_num / RV1108_DRV_PINS_PER_REG) * 4);
+	*bit = pin_num % RV1108_DRV_PINS_PER_REG;
+	*bit *= RV1108_DRV_BITS_PER_PIN;
 }
 
 #define RK2928_PULL_OFFSET		0x118
@@ -1183,7 +1183,7 @@ static int rockchip_get_pull(struct rockchip_pin_bank *bank, int pin_num)
 		return !(data & BIT(bit))
 				? PIN_CONFIG_BIAS_PULL_PIN_DEFAULT
 				: PIN_CONFIG_BIAS_DISABLE;
-	case RK1108:
+	case RV1108:
 	case RK3188:
 	case RK3288:
 	case RK3368:
@@ -1230,7 +1230,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
 
 		spin_unlock_irqrestore(&bank->slock, flags);
 		break;
-	case RK1108:
+	case RV1108:
 	case RK3188:
 	case RK3288:
 	case RK3368:
@@ -1420,7 +1420,7 @@ static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl,
 					pull == PIN_CONFIG_BIAS_DISABLE);
 	case RK3066B:
 		return pull ? false : true;
-	case RK1108:
+	case RV1108:
 	case RK3188:
 	case RK3288:
 	case RK3368:
@@ -2518,7 +2518,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static struct rockchip_pin_bank rk1108_pin_banks[] = {
+static struct rockchip_pin_bank rv1108_pin_banks[] = {
 	PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", IOMUX_SOURCE_PMU,
 					     IOMUX_SOURCE_PMU,
 					     IOMUX_SOURCE_PMU,
@@ -2528,15 +2528,15 @@ static struct rockchip_pin_bank rk1108_pin_banks[] = {
 	PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3", 0, 0, 0, 0),
 };
 
-static struct rockchip_pin_ctrl rk1108_pin_ctrl = {
-	.pin_banks		= rk1108_pin_banks,
-	.nr_banks		= ARRAY_SIZE(rk1108_pin_banks),
-	.label			= "RK1108-GPIO",
-	.type			= RK1108,
+static struct rockchip_pin_ctrl rv1108_pin_ctrl = {
+	.pin_banks		= rv1108_pin_banks,
+	.nr_banks		= ARRAY_SIZE(rv1108_pin_banks),
+	.label			= "RV1108-GPIO",
+	.type			= RV1108,
 	.grf_mux_offset		= 0x10,
 	.pmu_mux_offset		= 0x0,
-	.pull_calc_reg		= rk1108_calc_pull_reg_and_bit,
-	.drv_calc_reg		= rk1108_calc_drv_reg_and_bit,
+	.pull_calc_reg		= rv1108_calc_pull_reg_and_bit,
+	.drv_calc_reg		= rv1108_calc_drv_reg_and_bit,
 };
 
 static struct rockchip_pin_bank rk2928_pin_banks[] = {
@@ -2768,8 +2768,8 @@ static struct rockchip_pin_ctrl rk3399_pin_ctrl = {
 };
 
 static const struct of_device_id rockchip_pinctrl_dt_match[] = {
-	{ .compatible = "rockchip,rk1108-pinctrl",
-		.data = (void *)&rk1108_pin_ctrl },
+	{ .compatible = "rockchip,rv1108-pinctrl",
+		.data = (void *)&rv1108_pin_ctrl },
 	{ .compatible = "rockchip,rk2928-pinctrl",
 		.data = (void *)&rk2928_pin_ctrl },
 	{ .compatible = "rockchip,rk3036-pinctrl",
Signature · 1 line
2.7.4
author
#16 lore raw

PATCH 6/7 ARM: dts: rename RK1108 to RV1108

In reply to Andy Yan

Rockchip finally named the SOC as RV1108, so change it for compatible.

---

 arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
 rename arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} (94%)
arch/arm/boot/dts/rv1108.dtsi renamed from arch/arm/boot/dts/rk1108.dtsi +12 -12
similarity index 94%
rename from arch/arm/boot/dts/rk1108.dtsi
rename to arch/arm/boot/dts/rv1108.dtsi
index d770023..f363960 100644
@@ -41,13 +41,13 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/clock/rk1108-cru.h>
+#include <dt-bindings/clock/rv1108-cru.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	compatible = "rockchip,rk1108";
+	compatible = "rockchip,rv1108";
 
 	interrupt-parent = <&gic>;
 
@@ -113,7 +113,7 @@
 	};
 
 	uart2: serial at 10210000 {
-		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";
+		compatible = "rockchip,rv1108-uart", "snps,dw-apb-uart";
 		reg = <0x10210000 0x100>;
 		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
@@ -127,7 +127,7 @@
 	};
 
 	uart1: serial at 10220000 {
-		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";
+		compatible = "rockchip,rv1108-uart", "snps,dw-apb-uart";
 		reg = <0x10220000 0x100>;
 		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
@@ -141,7 +141,7 @@
 	};
 
 	uart0: serial at 10230000 {
-		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";
+		compatible = "rockchip,rv1108-uart", "snps,dw-apb-uart";
 		reg = <0x10230000 0x100>;
 		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
@@ -155,17 +155,17 @@
 	};
 
 	grf: syscon at 10300000 {
-		compatible = "rockchip,rk1108-grf", "syscon";
+		compatible = "rockchip,rv1108-grf", "syscon";
 		reg = <0x10300000 0x1000>;
 	};
 
 	pmugrf: syscon at 20060000 {
-		compatible = "rockchip,rk1108-pmugrf", "syscon";
+		compatible = "rockchip,rv1108-pmugrf", "syscon";
 		reg = <0x20060000 0x1000>;
 	};
 
 	cru: clock-controller at 20200000 {
-		compatible = "rockchip,rk1108-cru";
+		compatible = "rockchip,rv1108-cru";
 		reg = <0x20200000 0x1000>;
 		rockchip,grf = <&grf>;
 		#clock-cells = <1>;
@@ -173,7 +173,7 @@
 	};
 
 	emmc: dwmmc at 30110000 {
-		compatible = "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc";
+		compatible = "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc";
 		clock-freq-min-max = <400000 150000000>;
 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
@@ -185,7 +185,7 @@
 	};
 
 	sdio: dwmmc at 30120000 {
-		compatible = "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc";
+		compatible = "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc";
 		clock-freq-min-max = <400000 150000000>;
 		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
 			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
@@ -197,7 +197,7 @@
 	};
 
 	sdmmc: dwmmc at 30130000 {
-		compatible = "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc";
+		compatible = "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc";
 		clock-freq-min-max = <400000 100000000>;
 		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
 			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
@@ -222,7 +222,7 @@
 	};
 
 	pinctrl: pinctrl {
-		compatible = "rockchip,rk1108-pinctrl";
+		compatible = "rockchip,rv1108-pinctrl";
 		rockchip,grf = <&grf>;
 		rockchip,pmu = <&pmugrf>;
 		#address-cells = <1>;
Signature · 1 line
2.7.4
author
#17 lore raw

PATCH 7/7 ARM: rockchip: reanme RK1108 to RV1108

In reply to Andy Yan

Rockchip finally named the SOC as RV1108, so change it for compatible.

---

 Documentation/devicetree/bindings/arm/rockchip.txt   | 4 ++--
 arch/arm/boot/dts/Makefile                           | 2 +-
 arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} (89%)
Documentation/devicetree/bindings/arm/rockchip.txt +2 -2
index cc4ace6..9901cbd 100644
@@ -111,9 +111,9 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";
 
-- Rockchip RK1108 Evaluation board
+- Rockchip RV1108 Evaluation board
     Required root node properties:
-      - compatible = "rockchip,rk1108-evb", "rockchip,rk1108";
+      - compatible = "rockchip,rv1108-evb", "rockchip,rv1108";
 
 - Rockchip RK3368 evb:
     Required root node properties:
arch/arm/boot/dts/Makefile +1 -1
index f10fe85..7100227 100644
@@ -658,7 +658,7 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \
 	arm-realview-pba8.dtb \
 	arm-realview-pbx-a9.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
-	rk1108-evb.dtb \
+	rv1108-evb.dtb \
 	rk3036-evb.dtb \
 	rk3036-kylin.dtb \
 	rk3066a-bqcurie2.dtb \
arch/arm/boot/dts/rv1108-evb.dts renamed from arch/arm/boot/dts/rk1108-evb.dts +3 -3
similarity index 89%
rename from arch/arm/boot/dts/rk1108-evb.dts
rename to arch/arm/boot/dts/rv1108-evb.dts
index 3956cff..2f5d46b 100644
@@ -40,11 +40,11 @@
 
 /dts-v1/;
 
-#include "rk1108.dtsi"
+#include "rv1108.dtsi"
 
 / {
-	model = "Rockchip RK1108 Evaluation board";
-	compatible = "rockchip,rk1108-evb", "rockchip,rk1108";
+	model = "Rockchip RV1108 Evaluation board";
+	compatible = "rockchip,rv1108-evb", "rockchip,rv1108";
 
 	memory at 60000000 {
 		device_type = "memory";
@@ -53,6 +53,7 @@
 
 	chosen {
 		stdout-path = "serial2:1500000n8";
 	};
 };
 
Signature · 1 line
2.7.4
maintainer Acked-by on v1 7/7
#18 lore raw

Re: [PATCH 7/7] ARM: rockchip: reanme RK1108 to RV1108

Quoted 11 lines · Andy Yan

Rockchip finally named the SOC as RV1108, so change it for compatible.

---

 Documentation/devicetree/bindings/arm/rockchip.txt   | 4 ++--
 arch/arm/boot/dts/Makefile                           | 2 +-
 arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} (89%)

Would be nice to have the information in the discussion summarized here.

maintainer
#19 lore raw

cover Rename RK1108 to RV1108

In reply to Andy Yan

Hi Andy,

Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:

Quoted 2 lines

Rockchip finally named this soc as RV1108, so change RK1108/rk1108 to RV1108/rv1108 for compatible.

renaming existing bindings (that have been in multiple kernel versions already) always is a hot topic. So I'll be hoping for Rob to give a go-ahead for it :-) .

Just to confirm, the rk1108/rv1108 is completely new to the market, so we're not breaking any existing devices, right?

Heiko

Quoted 29 lines

Andy Yan (7):
dt-bindings: rockchip-dw-mshc: rename RK1108 to RV1108
dt-bindings: rk1108-cru: rename RK1108 to RV1108
clk: rockchip: rename RK1108 to RV1108
dt-bindings: rockchip,pinctrl: rename RK1108 to RV1108
pinctrl: rockchip: rename RK1108 to RV1108
ARM: dts: rename RK1108 to RV1108
ARM: rockchip: reanme RK1108 to RV1108

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +-
 ...chip,rk1108-cru.txt => rockchip,rv1108-cru.txt} |  12 +-
 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   2 +-
 .../bindings/pinctrl/rockchip,pinctrl.txt          |  16 +-
 arch/arm/boot/dts/Makefile                         |   2 +-
 .../boot/dts/{rk1108-evb.dts => rv1108-evb.dts}    |   7 +-
 arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi}     |  24 +-
 drivers/clk/rockchip/Makefile                      |   2 +-
 .../clk/rockchip/{clk-rk1108.c => clk-rv1108.c}    | 414
++++++++++----------- drivers/clk/rockchip/clk.h                         | 
28 +-
 drivers/pinctrl/pinctrl-rockchip.c                 |  76 ++--
 .../clock/{rk1108-cru.h => rv1108-cru.h}           |   6 +-
 12 files changed, 300 insertions(+), 293 deletions(-)
 rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt =>
rockchip,rv1108-cru.txt} (83%) rename arch/arm/boot/dts/{rk1108-evb.dts =>
rv1108-evb.dts} (89%) rename arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi}
(94%)
 rename drivers/clk/rockchip/{clk-rk1108.c => clk-rv1108.c} (57%)
 rename include/dt-bindings/clock/{rk1108-cru.h => rv1108-cru.h} (97%)
author
#20 lore raw

cover Rename RK1108 to RV1108

Hi Heiko & Rob:

Quoted 11 lines · Heiko Stuebner

Hi Andy,

Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:

Quoted 2 lines

Rockchip finally named this soc as RV1108, so change RK1108/rk1108 to RV1108/rv1108 for compatible.

renaming existing bindings (that have been in multiple kernel versions already) always is a hot topic. So I'll be hoping for Rob to give a go-ahead for it :-) .

Just to confirm, the rk1108/rv1108 is completely new to the market, so we're not breaking any existing devices, right?

Yes, the 1108 Soc is completely new to market, this change will not
breaking any existing devices.
Hope more suggestions from you.

Quoted 43 lines

Heiko

Quoted 23 lines

Andy Yan (7):

   dt-bindings: rockchip-dw-mshc: rename RK1108 to RV1108
   dt-bindings: rk1108-cru: rename RK1108 to RV1108
   clk: rockchip: rename RK1108 to RV1108
   dt-bindings: rockchip,pinctrl: rename RK1108 to RV1108
   pinctrl: rockchip: rename RK1108 to RV1108
   ARM: dts: rename RK1108 to RV1108
   ARM: rockchip: reanme RK1108 to RV1108
  Documentation/devicetree/bindings/arm/rockchip.txt |   4 +-
  ...chip,rk1108-cru.txt => rockchip,rv1108-cru.txt} |  12 +-
  .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   2 +-
  .../bindings/pinctrl/rockchip,pinctrl.txt          |  16 +-
  arch/arm/boot/dts/Makefile                         |   2 +-
  .../boot/dts/{rk1108-evb.dts => rv1108-evb.dts}    |   7 +-
  arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi}     |  24 +-
  drivers/clk/rockchip/Makefile                      |   2 +-
  .../clk/rockchip/{clk-rk1108.c => clk-rv1108.c}    | 414
++++++++++----------- drivers/clk/rockchip/clk.h                         |
28 +-
  drivers/pinctrl/pinctrl-rockchip.c                 |  76 ++--
  .../clock/{rk1108-cru.h => rv1108-cru.h}           |   6 +-
  12 files changed, 300 insertions(+), 293 deletions(-)
Quoted 6 lines

rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt =>
rockchip,rv1108-cru.txt} (83%) rename arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} (89%) rename arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} (94%)
rename drivers/clk/rockchip/{clk-rk1108.c => clk-rv1108.c} (57%) rename include/dt-bindings/clock/{rk1108-cru.h => rv1108-cru.h} (97%)

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#21 lore raw

cover Rename RK1108 to RV1108

Quoted 15 lines · Andy Yan

Hi Heiko & Rob:

Quoted 13 lines · Heiko Stuebner

Hi Andy,

Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:

Quoted 3 lines

Rockchip finally named this soc as RV1108, so change RK1108/rk1108 to RV1108/rv1108 for compatible.

renaming existing bindings (that have been in multiple kernel versions already) always is a hot topic. So I'll be hoping for Rob to give a go-ahead
for it :-) .

Quoted 7 lines
Quoted 3 lines

Just to confirm, the rk1108/rv1108 is completely new to the market, so we're
not breaking any existing devices, right?

Yes, the 1108 Soc is completely new to market, this change will not
breaking any existing devices.

Nobody gets hurt. Just rename everything to avoid confusion. Just my ?0.01.

Tell me if I can merge a subset of the patches to the pinctrl tree.

Yours,
Linus Walleij

maintainer
#22 lore raw

cover Rename RK1108 to RV1108

Hi Linus,

Am Donnerstag, 23. Februar 2017, 11:15:56 CET schrieb Linus Walleij:

Quoted 21 lines · Andy Yan
Quoted 20 lines

Hi Heiko & Rob:

Quoted 6 lines · Heiko Stuebner

Hi Andy,

Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:

Quoted 2 lines

Rockchip finally named this soc as RV1108, so change RK1108/rk1108 to RV1108/rv1108 for compatible.

Quoted 9 lines

renaming existing bindings (that have been in multiple kernel versions already) always is a hot topic. So I'll be hoping for Rob to give a go-ahead
for it :-) .

Just to confirm, the rk1108/rv1108 is completely new to the market, so we're
not breaking any existing devices, right?

Yes, the 1108 Soc is completely new to market, this change will not

Quoted 8 lines
Quoted 1 line

breaking any existing devices.

Nobody gets hurt. Just rename everything to avoid confusion. Just my ?0.01.

Tell me if I can merge a subset of the patches to the pinctrl tree.

I did provide Reviewed-bys for them, so you should be able to merge the pinctrl patches (4+5) at your convenience :-)

Thanks
Heiko

#23 lore raw

cover Rename RK1108 to RV1108

Quoted 11 lines · Heiko Stuebner

Am Donnerstag, 23. Februar 2017, 11:15:56 CET schrieb Linus Walleij:

Quoted 6 lines

Nobody gets hurt. Just rename everything to avoid confusion. Just my ?0.01.

Tell me if I can merge a subset of the patches to the pinctrl tree.

I did provide Reviewed-bys for them, so you should be able to merge the pinctrl patches (4+5) at your convenience :-)

They are conflicting right now, but I will merge it when I get a v4.11-rc1 based series.

Yours,
Linus Walleij