Re: [linux-sunxi] [PATCH v2 00/10] Allwinner H3 DVFS support

2018-04-23 Thread Chen-Yu Tsai 
On Mon, Apr 16, 2018 at 12:41 PM, Chen-Yu Tsai  wrote:
> Hi,
>
> On Tue, Feb 6, 2018 at 12:48 PM, Icenowy Zheng  wrote:
>> This patchset tries to add DVFS support for Allwinner H3 SoC,
>> considering two kinds of adjustable regulators used on H3 boards:
>> SY8106A I2C-controlled regulator and SY8113B regulator (controllable
>> by GPIO with some special designs on the board), and also taking the
>> uncontrollable boards into consider.
>>
>> PATCH 1 and PATCH 2 are for the SY8106A regulator, then PATCH 3 and
>> PATCH 4 are for the r_i2c bus, which is used by boards with SY8106A
>> to communicate with the regulator.
>>
>> PATCH 5 adds the operating points v2 table to the H3 SoC, but with
>> OPPs higher than 1008MHz temporarily dropped.
>>
>> Then there's patches for several tested boards: Orange Pi PC (with
>> SY8106A), Orange Pi One/Zero (with GPIO-adjustable SY8113B) and
>> ALL-H3-CC (unadjustable).
>>
>> Icenowy Zheng (5):
>>   ARM: sun8i: h3: add operating-points-v2 table for CPU
>>   ARM: sun8i: h2+: add SY8113B regulator used by Orange Pi Zero board
>>   ARM: sun8i: h3: add SY8113B regulator used by Orange Pi One board
>>   ARM: sun8i: h3: fix ALL-H3-CC H3 ver VDD-CPUX voltage
>>   ARM: sun8i: h3: set the cpu-supply to VDD-CPUX on ALL-H3-CC H3 ver
>>
>> Ondrej Jirman (5):
>>   dt-bindings: add binding for the SY8106A voltage regulator
>>   regulator: add support for SY8106A regulator
>>   ARM: sunxi: h3/h5: Add r_i2c pinmux node
>>   ARM: sunxi: h3/h5: Add r_i2c I2C controller
>>   ARM: sun8i: h3: Add SY8106A regulator to Orange Pi PC

Dropped this patch at your request. The rest will be in -next.

ChenYu

>
> I've applied all the device tree patches for 4.18, taking into account
> comments from Maxime. See
>
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/h3-h5-for-4.17
>
> Mostly it's just renaming the regulator node names and labels.
>
> Please resend the first two patches to Mark Brown, the regulator
> subsystem maintainer. And you might want to mention the branch
> above in case he needs a use case reference.
>
> Regards
> ChenYu

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[linux-sunxi] Re: [PATCH v3 3/3] ARM: dts: sun8i: h3: Add SY8106A regulator to Orange Pi PC

2018-04-23 Thread Icenowy Zheng 


于 2018年4月23日 GMT+08:00 下午11:03:09, Maxime Ripard  写到:
>On Mon, Apr 23, 2018 at 10:46:57PM +0800, Icenowy Zheng wrote:
>> From: Ondrej Jirman 
>> 
>> Add SY8106A regulator to r_i2c bus and enable the r_i2c bus on
>> Orange Pi PC, then set the power supply of the ARM cores to this
>> regulator, in order to enable DVFS.
>> 
>> Signed-off-by: Ondrej Jirman 
>> [Icenowy: Enable DVFS in this patch, slight changes and change commit
>>  message]
>> Signed-off-by: Icenowy Zheng 
>> Reviewed-by: Chen-Yu Tsai 
>> [w...@csie.org: Rename regulator label]
>> Signed-off-by: Chen-Yu Tsai 
>
>Why is there Chen-Yu's SoB? It doesn't really make much sense, unless
>Chen-Yu would have applied this patch already, but then you wouldn't
>post it, right?

This is taken from sunxi/h3-h5-for-4.18 branch, which has
label name change from wens, and then added microvolt property.

So his SoB is from when he apply it for the first time.

>
>Maxime 
>
>> ---

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[linux-sunxi] Re: [PATCH v3 3/3] ARM: dts: sun8i: h3: Add SY8106A regulator to Orange Pi PC

2018-04-23 Thread Maxime Ripard 
On Mon, Apr 23, 2018 at 10:46:57PM +0800, Icenowy Zheng wrote:
> From: Ondrej Jirman 
> 
> Add SY8106A regulator to r_i2c bus and enable the r_i2c bus on
> Orange Pi PC, then set the power supply of the ARM cores to this
> regulator, in order to enable DVFS.
> 
> Signed-off-by: Ondrej Jirman 
> [Icenowy: Enable DVFS in this patch, slight changes and change commit
>  message]
> Signed-off-by: Icenowy Zheng 
> Reviewed-by: Chen-Yu Tsai 
> [w...@csie.org: Rename regulator label]
> Signed-off-by: Chen-Yu Tsai 

Why is there Chen-Yu's SoB? It doesn't really make much sense, unless
Chen-Yu would have applied this patch already, but then you wouldn't
post it, right?

Maxime 

> ---

-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[linux-sunxi] [PATCH v3 3/3] ARM: dts: sun8i: h3: Add SY8106A regulator to Orange Pi PC

2018-04-23 Thread Icenowy Zheng 
From: Ondrej Jirman 

Add SY8106A regulator to r_i2c bus and enable the r_i2c bus on
Orange Pi PC, then set the power supply of the ARM cores to this
regulator, in order to enable DVFS.

Signed-off-by: Ondrej Jirman 
[Icenowy: Enable DVFS in this patch, slight changes and change commit
 message]
Signed-off-by: Icenowy Zheng 
Reviewed-by: Chen-Yu Tsai 
[w...@csie.org: Rename regulator label]
Signed-off-by: Chen-Yu Tsai 
---
Changes in v3:
- Renamed regulator label (by Chen-Yu Tsai).
- Added the fixed mode voltage number.

Changes in v2:
- Reduce maximum voltage to 1.3V.
- Slightly changed the comment at 1.0V minimum voltage for taking BSP
  DVFS table instead of Armbian one.

 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 28 
 1 file changed, 28 insertions(+)

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts 
b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
index cea4d647ecbf..46240334128f 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
@@ -113,6 +113,10 @@
status = "okay";
 };
 
+ {
+   cpu-supply = <_vdd_cpux>;
+};
+
  {
status = "okay";
 };
@@ -182,6 +186,30 @@
};
 };
 
+_i2c {
+   status = "okay";
+
+   reg_vdd_cpux: regulator@65 {
+   compatible = "silergy,sy8106a";
+   reg = <0x65>;
+   regulator-name = "vdd-cpux";
+   silergy,fixed-microvolt = <120>;
+   /*
+* The datasheet uses 1.1V as the minimum value of VDD-CPUX,
+* however both the Armbian DVFS table and the official one
+* have operating points with voltage under 1.1V, and both
+* DVFS table are known to work properly at the lowest
+* operating point.
+*
+* Use 1.0V as the minimum voltage instead.
+*/
+   regulator-min-microvolt = <100>;
+   regulator-max-microvolt = <130>;
+   regulator-boot-on;
+   regulator-always-on;
+   };
+};
+
 _pio {
leds_r_opc: led_pins {
pins = "PL10";
-- 
2.15.1

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[linux-sunxi] [PATCH v3 0/3] SY8106 regulator support and enable it on Orange Pi PC

2018-04-23 Thread Icenowy Zheng 
This patchset adds dt-bindings and driver for Silergy SY8106A, and then
utilize it on the Orange Pi PC board, which uses SY8016A as its CPUX
(main ARM CPU cluster in an Allwinner SoC) power supply.

The driver's functionality is restricted now, mainly {en,dis}able function
is not yet implemented, as it cannot be debugged on Orange Pi PC
(disable it will kill Linux).

Ondrej Jirman (3):
  dt-bindings: add binding for the SY8106A voltage regulator
  regulator: add support for SY8106A regulator
  ARM: dts: sun8i: h3: Add SY8106A regulator to Orange Pi PC

 .../bindings/regulator/sy8106a-regulator.txt   |  23 +++
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts |  28 
 drivers/regulator/Kconfig  |   8 +-
 drivers/regulator/Makefile |   2 +-
 drivers/regulator/sy8106a-regulator.c  | 183 +
 5 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 
Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
 create mode 100644 drivers/regulator/sy8106a-regulator.c

-- 
2.15.1

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[linux-sunxi] [PATCH v3 2/3] regulator: add support for SY8106A regulator

2018-04-23 Thread Icenowy Zheng 
From: Ondrej Jirman 

SY8106A is an I2C attached single output regulator made by Silergy Corp,
which is used on several Allwinner H3/H5 SBCs to control the power
supply of the ARM cores.

Add a driver for it.

Signed-off-by: Ondrej Jirman 
[Icenowy: Change commit message, remove enable/disable code, add default
 ramp_delay, add comment for go bit, add code for fixed mode voltage]
Signed-off-by: Icenowy Zheng 
Reviewed-by: Chen-Yu Tsai 
---
Changes in v3:
- Return the fixed voltage defined in device tree when I2C regulating
  not enabled (in this situation the register may contain no valid
  voltage data).

Changes in v2:
- Dropped the enable/disable code.
- Added default ramp_delay value.
- Added comment for the "go bit".

 MAINTAINERS   |   6 ++
 drivers/regulator/Kconfig |   7 ++
 drivers/regulator/Makefile|   2 +-
 drivers/regulator/sy8106a-regulator.c | 175 ++
 4 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 drivers/regulator/sy8106a-regulator.c

diff --git a/MAINTAINERS b/MAINTAINERS
index a33643739820..e0cb78568458 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13464,6 +13464,12 @@ S: Supported
 F: net/switchdev/
 F: include/net/switchdev.h
 
+SY8106A REGULATOR DRIVER
+M: Icenowy Zheng 
+S: Maintained
+F: drivers/regulator/sy8106a-regulator.c
+F: Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
+
 SYNC FILE FRAMEWORK
 M: Sumit Semwal 
 R: Gustavo Padovan 
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 097f61784a7d..4efae3b7e746 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -801,6 +801,13 @@ config REGULATOR_STW481X_VMMC
  This driver supports the internal VMMC regulator in the STw481x
  PMIC chips.
 
+config REGULATOR_SY8106A
+   tristate "Silergy SY8106A regulator"
+   depends on I2C && (OF || COMPILE_TEST)
+   select REGMAP_I2C
+   help
+ This driver supports SY8106A single output regulator.
+
 config REGULATOR_TPS51632
tristate "TI TPS51632 Power Regulator"
depends on I2C
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 590674fbecd7..d81fb02bd6e9 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -100,6 +100,7 @@ obj-$(CONFIG_REGULATOR_SC2731) += sc2731-regulator.o
 obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.o
 obj-$(CONFIG_REGULATOR_STM32_VREFBUF) += stm32-vrefbuf.o
 obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
+obj-$(CONFIG_REGULATOR_SY8106A) += sy8106a-regulator.o
 obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
 obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o
@@ -125,5 +126,4 @@ obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
 obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
 obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
 
-
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
diff --git a/drivers/regulator/sy8106a-regulator.c 
b/drivers/regulator/sy8106a-regulator.c
new file mode 100644
index ..6dbe41044ab9
--- /dev/null
+++ b/drivers/regulator/sy8106a-regulator.c
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * sy8106a-regulator.c - Regulator device driver for SY8106A
+ *
+ * Copyright (C) 2016 Ondřej Jirman 
+ * Copyright (c) 2017-2018 Icenowy Zheng 
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#define SY8106A_REG_VOUT1_SEL  0x01
+#define SY8106A_REG_VOUT_COM   0x02
+#define SY8106A_REG_VOUT1_SEL_MASK 0x7f
+#define SY8106A_DISABLE_REGBIT(0)
+/*
+ * The I2C controlled voltage will only work when this bit is set; otherwise
+ * it will behave like a fixed regulator.
+ */
+#define SY8106A_GO_BIT BIT(7)
+
+struct sy8106a {
+   struct regulator_dev *rdev;
+   struct regmap *regmap;
+   u32 fixed_voltage;
+};
+
+static const struct regmap_config sy8106a_regmap_config = {
+   .reg_bits = 8,
+   .val_bits = 8,
+};
+
+static int sy8106a_set_voltage_sel(struct regulator_dev *rdev, unsigned int 
sel)
+{
+   /* We use our set_voltage_sel in order to avoid unnecessary I2C
+* chatter, because the regulator_get_voltage_sel_regmap using
+* apply_bit would perform 4 unnecessary transfers instead of one,
+* increasing the chance of error.
+*/
+   return regmap_write(rdev->regmap, rdev->desc->vsel_reg,
+   sel | SY8106A_GO_BIT);
+}
+
+static int sy8106a_get_voltage_sel(struct regulator_dev *rdev)
+{
+   struct sy8106a *chip = rdev_get_drvdata(rdev);
+   unsigned int reg;
+   int error;
+
+   error = regmap_read(rdev->regmap,

[linux-sunxi] [PATCH v3 1/3] dt-bindings: add binding for the SY8106A voltage regulator

2018-04-23 Thread Icenowy Zheng 
From: Ondrej Jirman 

SY8106A is an I2C-controlled adjustable voltage regulator made by
Silergy Corp.

Add its device tree binding.

Signed-off-by: Ondrej Jirman 
[Icenowy: Change commit message and slight fixes]
Signed-off-by: Icenowy Zheng 
Reviewed-by: Chen-Yu Tsai 
Acked-by: Rob Herring 
---
Changes in v3:
- Added silergy,fixed-microvolt property.

Changes in v2:
- Added Chen-Yu's Reviewed tag and Rob's ACK tag.
- Specify regulator.txt's directory.

 .../bindings/regulator/sy8106a-regulator.txt   | 23 ++
 1 file changed, 23 insertions(+)
 create mode 100644 
Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt

diff --git a/Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt 
b/Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
new file mode 100644
index ..39a8ca73f572
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
@@ -0,0 +1,23 @@
+SY8106A Voltage regulator
+
+Required properties:
+- compatible: Must be "silergy,sy8106a"
+- reg: I2C slave address - must be <0x65>
+- silergy,fixed-microvolt - the voltage when I2C regulating is disabled (set
+  by external resistor like a fixed voltage)
+
+Any property defined as part of the core regulator binding, defined in
+./regulator.txt, can also be used.
+
+Example:
+
+   sy8106a {
+   compatible = "silergy,sy8106a";
+   reg = <0x65>;
+   regulator-name = "sy8106a-vdd";
+   silergy,fixed-microvolt = <120>;
+   regulator-min-microvolt = <100>;
+   regulator-max-microvolt = <140>;
+   regulator-boot-on;
+   regulator-always-on;
+   };
-- 
2.15.1

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun4i: Fix incorrect clocks for displays

2018-04-23 Thread Maxime Ripard 
On Mon, Apr 23, 2018 at 01:01:03PM +0200, Pascal Roeleven wrote:
> On 2018-04-23 09:14, Maxime Ripard wrote:
> > On Fri, Apr 20, 2018 at 12:21:12PM +0200, Pascal Roeleven wrote:
> > > Some displays on SUN4i devices wouldn't properly stay on unless
> > > 'clk_ignore_unused' is used.
> > > 
> > > Change the duplicate clocks to the probably intended ones.
> > > 
> > > Signed-off-by: Pascal Roeleven 
> > 
> > What was the difference with the first patch you sent?
> > 
> > Anyway, I've applied it, thanks
> > 
> > Maxime
> > 
> > --
> > Maxime Ripard, Bootlin (formerly Free Electrons)
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
> 
> I'm sorry there isn't any.
> It's the first patch I have ever send so had some git-send-email issues and
> didn't know the correct procedure to resend a patch.

Just set RESEND in the subject prefix (using --subject-prefix="PATCH
RESEND"), and say why you resent it in the patch / cover letter after
the --- and before the diffstat.

Maxime

-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun4i: Fix incorrect clocks for displays

2018-04-23 Thread Pascal Roeleven 

On 2018-04-23 09:14, Maxime Ripard wrote:

On Fri, Apr 20, 2018 at 12:21:12PM +0200, Pascal Roeleven wrote:

Some displays on SUN4i devices wouldn't properly stay on unless
'clk_ignore_unused' is used.

Change the duplicate clocks to the probably intended ones.

Signed-off-by: Pascal Roeleven 


What was the difference with the first patch you sent?

Anyway, I've applied it, thanks

Maxime

--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com


I'm sorry there isn't any.
It's the first patch I have ever send so had some git-send-email issues 
and

didn't know the correct procedure to resend a patch.

--
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[linux-sunxi] Re: [PATCH] Revert "drm/sun4i: add lvds mode_valid function"

2018-04-23 Thread Maxime Ripard 
On Sat, Apr 21, 2018 at 06:51:55AM +0200, meg...@megous.com wrote:
> From: Ondrej Jirman 
> 
> The reverted commit broke LVDS output on TBS A711 Tablet. That tablet
> has simple-panel node that has fixed pixel clock-frequency that A83T
> SoC used in the tablet can't generate exactly.
> 
> Requested rate is 5200 and rounded_rate is calculated as 51857142.
> It's close enough for it to work in practice, but with strict check
> in the reverted commit, the mode is rejected needlessly in this case.
> 
> DT allows to specify a range of values for simple-panel/clock-frequency,
> but driver doesn't respect that ATM. Given that TBS A711 is the single
> user of sun4i-lvds driver, let's revert that commit for now, until
> a better solution for the problem is found.
> 
> Also see: https://patchwork.kernel.org/patch/9446385/ for relevant
> discussion (or search for "[RFC] drm/sun4i: rgb: Add 5% tolerance
> to dot clock frequency check").
> 
> Fixes: e4e4b7ad50cf ("drm/sun4i: add lvds mode_valid function")
> Reported-by: Ondrej Jirman 
> Signed-off-by: Ondrej Jirman 

Applied, thanks!
Maxime
-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[linux-sunxi] Re: [PATCH] arm64: allwinner: h6: restore the usage of CCU slice macros

2018-04-23 Thread Maxime Ripard 
On Mon, Apr 23, 2018 at 02:58:48PM +0800, Icenowy Zheng wrote:
> 在 2018-04-03二的 21:40 +0800，Icenowy Zheng写道：
> > As the definition of CCU slice macros are already merged into the
> > source
> > tree, restore the usage of the macros now.
> 
> Maxime, could you check this patch and pick it?

Applied, thanks!
maxime

-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[linux-sunxi] Re: [PATCH] ARM: dts: sun4i: Fix incorrect clocks for displays

2018-04-23 Thread Maxime Ripard 
On Fri, Apr 20, 2018 at 12:21:12PM +0200, Pascal Roeleven wrote:
> Some displays on SUN4i devices wouldn't properly stay on unless
> 'clk_ignore_unused' is used.
> 
> Change the duplicate clocks to the probably intended ones.
> 
> Signed-off-by: Pascal Roeleven 

What was the difference with the first patch you sent?

Anyway, I've applied it, thanks

Maxime

-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[linux-sunxi] Re: [PATCH] arm64: allwinner: h6: restore the usage of CCU slice macros

2018-04-23 Thread Icenowy Zheng 
在 2018-04-03二的 21:40 +0800，Icenowy Zheng写道：
> As the definition of CCU slice macros are already merged into the
> source
> tree, restore the usage of the macros now.

Maxime, could you check this patch and pick it?

Thanks!

> 
> Signed-off-by: Icenowy Zheng 
> ---
>  arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +++---
> --
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> index 56563150d61a..4debc3962830 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
> @@ -4,6 +4,8 @@
>   */
>  
>  #include 
> +#include 
> +#include 
>  
>  / {
>   interrupt-parent = <>;
> @@ -115,7 +117,7 @@
> IRQ_TYPE_LEVEL_HIGH>,
> IRQ_TYPE_LEVEL_HIGH>,
> IRQ_TYPE_LEVEL_HIGH>;
> - clocks = < 26>, <>, <>;
> + clocks = < CLK_APB1>, <>,
> <>;
>   clock-names = "apb", "hosc", "losc";
>   gpio-controller;
>   #gpio-cells = <3>;
> @@ -134,8 +136,8 @@
>   interrupts =  IRQ_TYPE_LEVEL_HIGH>;
>   reg-shift = <2>;
>   reg-io-width = <4>;
> - clocks = < 70>;
> - resets = < 21>;
> + clocks = < CLK_BUS_UART0>;
> + resets = < RST_BUS_UART0>;
>   status = "disabled";
>   };
>  
> @@ -145,8 +147,8 @@
>   interrupts =  IRQ_TYPE_LEVEL_HIGH>;
>   reg-shift = <2>;
>   reg-io-width = <4>;
> - clocks = < 71>;
> - resets = < 22>;
> + clocks = < CLK_BUS_UART1>;
> + resets = < RST_BUS_UART1>;
>   status = "disabled";
>   };
>  
> @@ -156,8 +158,8 @@
>   interrupts =  IRQ_TYPE_LEVEL_HIGH>;
>   reg-shift = <2>;
>   reg-io-width = <4>;
> - clocks = < 72>;
> - resets = < 23>;
> + clocks = < CLK_BUS_UART2>;
> + resets = < RST_BUS_UART2>;
>   status = "disabled";
>   };
>  
> @@ -167,8 +169,8 @@
>   interrupts =  IRQ_TYPE_LEVEL_HIGH>;
>   reg-shift = <2>;
>   reg-io-width = <4>;
> - clocks = < 73>;
> - resets = < 24>;
> + clocks = < CLK_BUS_UART3>;
> + resets = < RST_BUS_UART3>;
>   status = "disabled";
>   };
>   };

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.