[PATCH 0/7] Rename RK1108 to RV1108

[PATCH 0/7] Rename RK1108 to RV1108

[Andy Yan]

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%)

-- 
2.7.4


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

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

[Andy Yan]

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

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---

 drivers/pinctrl/pinctrl-rockchip.c | 76 +++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 08765f5..d7f1f9a 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -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",
-- 
2.7.4

Re: [PATCH 0/7] Rename RK1108 to RV1108

[Heiko Stuebner]

Hi Andy,

Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:
> 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



> 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%)

Re: [PATCH 0/7] Rename RK1108 to RV1108

[Andy Yan]

Hi Heiko & Rob:


On 2017年02月13日 20:51, Heiko Stuebner wrote:
> Hi Andy,
>
> Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:
>> 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.
>
> Heiko
>
>
>
>> 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%)
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>
>
>


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

Re: [PATCH 5/7] pinctrl: rockchip: rename RK1108 to RV1108

[Heiko Stuebner]

Am Montag, 13. Februar 2017, 19:07:53 CET schrieb Andy Yan:
> Rockchip finally named the SOC as RV1108, so change it.
> 
> Signed-off-by: Andy Yan <andy.yan@rock-chips.com>

Reviewed-by: Heiko Stuebner <heiko@sntech.de>

Re: [PATCH 0/7] Rename RK1108 to RV1108

[Linus Walleij]

On Tue, Feb 14, 2017 at 1:44 AM, Andy Yan <andy.yan@rock-chips.com> wrote:
> Hi Heiko & Rob:
> On 2017年02月13日 20:51, Heiko Stuebner wrote:
>>
>> Hi Andy,
>>
>> Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:
>>>
>>> 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.

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

Acked-by: Linus Walleij <linus.walleij@linaro.org>

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

Yours,
Linus Walleij

Re: [PATCH 0/7] Rename RK1108 to RV1108

[Heiko Stuebner]

Hi Linus,

Am Donnerstag, 23. Februar 2017, 11:15:56 CET schrieb Linus Walleij:
> On Tue, Feb 14, 2017 at 1:44 AM, Andy Yan <andy.yan@rock-chips.com> wrote:
> > Hi Heiko & Rob:
> > 
> > On 2017年02月13日 20:51, Heiko Stuebner wrote:
> >> Hi Andy,
> >> 
> >> Am Montag, 13. Februar 2017, 18:59:26 CET schrieb Andy Yan:
> >>> 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.
> 
> Nobody gets hurt. Just rename everything to avoid confusion.
> Just my €0.01.
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> 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

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

Re: [PATCH 0/7] Rename RK1108 to RV1108

[Linus Walleij]

On Thu, Feb 23, 2017 at 4:00 PM, Heiko Stuebner <heiko@sntech.de> wrote:
> Am Donnerstag, 23. Februar 2017, 11:15:56 CET schrieb Linus Walleij:

>> Nobody gets hurt. Just rename everything to avoid confusion.
>> Just my €0.01.
>>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> 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