[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[Jorge Ramirez-Ortiz]

Allow to specify the clock frequency for any given port via the
assigned-clock-rates device tree property.

Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
---
 drivers/tty/serial/amba-pl011.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 1b7331e..51867ab 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -55,6 +55,7 @@
 #include <linux/types.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/clk/clk-conf.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/sizes.h>
 #include <linux/io.h>
@@ -2472,6 +2473,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 	if (IS_ERR(uap->clk))
 		return PTR_ERR(uap->clk);
 
+	ret = of_clk_set_defaults(dev->dev.of_node, false);
+	if (ret < 0)
+		return ret;
+
 	uap->reg_offset = vendor->reg_offset;
 	uap->vendor = vendor;
 	uap->fifosize = vendor->get_fifosize(dev);
-- 
2.7.4

[PATCH 2/2] arm64: dts: set UART1 clock frequency to 150MHz

[Jorge Ramirez-Ortiz]

Enable support for higher baud rates (up to 3Mbps) in UART1 - required
for bluetooth transfers.

Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index e92a30c..27be812 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -55,6 +55,8 @@
 		};
 
 		uart1: uart at f7111000 {
+			assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
+			assigned-clock-rates = <150000000>;
 			status = "ok";
 		};
 
-- 
2.7.4

[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[Michael Turquette]

Quoting Jorge Ramirez-Ortiz (2016-07-08 01:11:06)
> Allow to specify the clock frequency for any given port via the
> assigned-clock-rates device tree property.
> 
> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> ---
>  drivers/tty/serial/amba-pl011.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> index 1b7331e..51867ab 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -55,6 +55,7 @@
>  #include <linux/types.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> +#include <linux/clk/clk-conf.h>
>  #include <linux/pinctrl/consumer.h>
>  #include <linux/sizes.h>
>  #include <linux/io.h>
> @@ -2472,6 +2473,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
>         if (IS_ERR(uap->clk))
>                 return PTR_ERR(uap->clk);
>  
> +       ret = of_clk_set_defaults(dev->dev.of_node, false);

Change looks good to me, but with one question: should this change be
put into more generic code instead of in this specific driver? For
instance, we call of_clk_set_defaults from the following files:

drivers/base/platform.c
drivers/i2c/i2c-core.c
drivers/spi/spi.c

And Stephen posted a patch to do this for devices on the AMBA bus:

https://patchwork.kernel.org/patch/6501691/

Does Stephen's patch mean that you do not need patch #1? Stephen, any
update on what happened to this patch?

Thanks,
Mike

> +       if (ret < 0)
> +               return ret;
> +
>         uap->reg_offset = vendor->reg_offset;
>         uap->vendor = vendor;
>         uap->fifosize = vendor->get_fifosize(dev);
> -- 
> 2.7.4
> 

[PATCH 2/2] arm64: dts: set UART1 clock frequency to 150MHz

[Michael Turquette]

Quoting Jorge Ramirez-Ortiz (2016-07-08 01:11:07)
> Enable support for higher baud rates (up to 3Mbps) in UART1 - required
> for bluetooth transfers.
> 
> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>

Reviewed-by: Michael Turquette <mturquette@baylibre.com>

> ---
>  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index e92a30c..27be812 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -55,6 +55,8 @@
>                 };
>  
>                 uart1: uart at f7111000 {
> +                       assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
> +                       assigned-clock-rates = <150000000>;
>                         status = "ok";
>                 };
>  
> -- 
> 2.7.4
> 

[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[Jorge Ramirez]

On 07/08/2016 07:14 PM, Michael Turquette wrote:
> Quoting Jorge Ramirez-Ortiz (2016-07-08 01:11:06)
>> Allow to specify the clock frequency for any given port via the
>> assigned-clock-rates device tree property.
>>
>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>> ---
>>   drivers/tty/serial/amba-pl011.c | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
>> index 1b7331e..51867ab 100644
>> --- a/drivers/tty/serial/amba-pl011.c
>> +++ b/drivers/tty/serial/amba-pl011.c
>> @@ -55,6 +55,7 @@
>>   #include <linux/types.h>
>>   #include <linux/of.h>
>>   #include <linux/of_device.h>
>> +#include <linux/clk/clk-conf.h>
>>   #include <linux/pinctrl/consumer.h>
>>   #include <linux/sizes.h>
>>   #include <linux/io.h>
>> @@ -2472,6 +2473,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
>>          if (IS_ERR(uap->clk))
>>                  return PTR_ERR(uap->clk);
>>   
>> +       ret = of_clk_set_defaults(dev->dev.of_node, false);
> Change looks good to me, but with one question: should this change be
> put into more generic code instead of in this specific driver? For
> instance, we call of_clk_set_defaults from the following files:
>
> drivers/base/platform.c
> drivers/i2c/i2c-core.c
> drivers/spi/spi.c
>
> And Stephen posted a patch to do this for devices on the AMBA bus:
>
> https://patchwork.kernel.org/patch/6501691/
>
> Does Stephen's patch mean that you do not need patch #1?

I did a quick test (replaced my changes with the patch above) and the 
console broke and the BT stack couldn't communicate to the device over 
the uart...I guess something else needs doing on top of Stephen's change.

[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[Michael Turquette]

Quoting Jorge Ramirez (2016-07-08 14:39:50)
> On 07/08/2016 07:14 PM, Michael Turquette wrote:
> > Quoting Jorge Ramirez-Ortiz (2016-07-08 01:11:06)
> >> Allow to specify the clock frequency for any given port via the
> >> assigned-clock-rates device tree property.
> >>
> >> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> >> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> >> ---
> >>   drivers/tty/serial/amba-pl011.c | 5 +++++
> >>   1 file changed, 5 insertions(+)
> >>
> >> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> >> index 1b7331e..51867ab 100644
> >> --- a/drivers/tty/serial/amba-pl011.c
> >> +++ b/drivers/tty/serial/amba-pl011.c
> >> @@ -55,6 +55,7 @@
> >>   #include <linux/types.h>
> >>   #include <linux/of.h>
> >>   #include <linux/of_device.h>
> >> +#include <linux/clk/clk-conf.h>
> >>   #include <linux/pinctrl/consumer.h>
> >>   #include <linux/sizes.h>
> >>   #include <linux/io.h>
> >> @@ -2472,6 +2473,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
> >>          if (IS_ERR(uap->clk))
> >>                  return PTR_ERR(uap->clk);
> >>   
> >> +       ret = of_clk_set_defaults(dev->dev.of_node, false);
> > Change looks good to me, but with one question: should this change be
> > put into more generic code instead of in this specific driver? For
> > instance, we call of_clk_set_defaults from the following files:
> >
> > drivers/base/platform.c
> > drivers/i2c/i2c-core.c
> > drivers/spi/spi.c
> >
> > And Stephen posted a patch to do this for devices on the AMBA bus:
> >
> > https://patchwork.kernel.org/patch/6501691/
> >
> > Does Stephen's patch mean that you do not need patch #1?
> 
> I did a quick test (replaced my changes with the patch above) and the 
> console broke and the BT stack couldn't communicate to the device over 
> the uart...I guess something else needs doing on top of Stephen's change.
> 

Let's give Stephen a chance to respond. If he doesn't soon then I'm OK
to merge your two patches.

Regards,
Mike

[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[Stephen Boyd]

On 07/08/2016 05:23 PM, Michael Turquette wrote:
> Quoting Jorge Ramirez (2016-07-08 14:39:50)
>> On 07/08/2016 07:14 PM, Michael Turquette wrote:
>>> Quoting Jorge Ramirez-Ortiz (2016-07-08 01:11:06)
>>>> Allow to specify the clock frequency for any given port via the
>>>> assigned-clock-rates device tree property.
>>>>
>>>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>>>> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>>>> ---
>>>>   drivers/tty/serial/amba-pl011.c | 5 +++++
>>>>   1 file changed, 5 insertions(+)
>>>>
>>>> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
>>>> index 1b7331e..51867ab 100644
>>>> --- a/drivers/tty/serial/amba-pl011.c
>>>> +++ b/drivers/tty/serial/amba-pl011.c
>>>> @@ -55,6 +55,7 @@
>>>>   #include <linux/types.h>
>>>>   #include <linux/of.h>
>>>>   #include <linux/of_device.h>
>>>> +#include <linux/clk/clk-conf.h>
>>>>   #include <linux/pinctrl/consumer.h>
>>>>   #include <linux/sizes.h>
>>>>   #include <linux/io.h>
>>>> @@ -2472,6 +2473,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
>>>>          if (IS_ERR(uap->clk))
>>>>                  return PTR_ERR(uap->clk);
>>>>   
>>>> +       ret = of_clk_set_defaults(dev->dev.of_node, false);
>>> Change looks good to me, but with one question: should this change be
>>> put into more generic code instead of in this specific driver? For
>>> instance, we call of_clk_set_defaults from the following files:
>>>
>>> drivers/base/platform.c
>>> drivers/i2c/i2c-core.c
>>> drivers/spi/spi.c
>>>
>>> And Stephen posted a patch to do this for devices on the AMBA bus:
>>>
>>> https://patchwork.kernel.org/patch/6501691/
>>>
>>> Does Stephen's patch mean that you do not need patch #1?
>> I did a quick test (replaced my changes with the patch above) and the 
>> console broke and the BT stack couldn't communicate to the device over 
>> the uart...I guess something else needs doing on top of Stephen's change.
>>
> Let's give Stephen a chance to respond. If he doesn't soon then I'm OK
> to merge your two patches.
>


Yeah we need to restart that patch. It's been in my "pending" list for a
year now it seems.

Curious why it broke things, perhaps device probe is failing when it
didn't fail before?

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[Jorge Ramirez]

On 07/09/2016 02:43 AM, Stephen Boyd wrote:
> On 07/08/2016 05:23 PM, Michael Turquette wrote:
>> Quoting Jorge Ramirez (2016-07-08 14:39:50)
>>> On 07/08/2016 07:14 PM, Michael Turquette wrote:
>>>> Quoting Jorge Ramirez-Ortiz (2016-07-08 01:11:06)
>>>>> Allow to specify the clock frequency for any given port via the
>>>>> assigned-clock-rates device tree property.
>>>>>
>>>>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>>>>> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>>>>> ---
>>>>>    drivers/tty/serial/amba-pl011.c | 5 +++++
>>>>>    1 file changed, 5 insertions(+)
>>>>>
>>>>> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
>>>>> index 1b7331e..51867ab 100644
>>>>> --- a/drivers/tty/serial/amba-pl011.c
>>>>> +++ b/drivers/tty/serial/amba-pl011.c
>>>>> @@ -55,6 +55,7 @@
>>>>>    #include <linux/types.h>
>>>>>    #include <linux/of.h>
>>>>>    #include <linux/of_device.h>
>>>>> +#include <linux/clk/clk-conf.h>
>>>>>    #include <linux/pinctrl/consumer.h>
>>>>>    #include <linux/sizes.h>
>>>>>    #include <linux/io.h>
>>>>> @@ -2472,6 +2473,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
>>>>>           if (IS_ERR(uap->clk))
>>>>>                   return PTR_ERR(uap->clk);
>>>>>    
>>>>> +       ret = of_clk_set_defaults(dev->dev.of_node, false);
>>>> Change looks good to me, but with one question: should this change be
>>>> put into more generic code instead of in this specific driver? For
>>>> instance, we call of_clk_set_defaults from the following files:
>>>>
>>>> drivers/base/platform.c
>>>> drivers/i2c/i2c-core.c
>>>> drivers/spi/spi.c
>>>>
>>>> And Stephen posted a patch to do this for devices on the AMBA bus:
>>>>
>>>> https://patchwork.kernel.org/patch/6501691/
>>>>
>>>> Does Stephen's patch mean that you do not need patch #1?
>>> I did a quick test (replaced my changes with the patch above) and the
>>> console broke and the BT stack couldn't communicate to the device over
>>> the uart...I guess something else needs doing on top of Stephen's change.
>>>
>> Let's give Stephen a chance to respond. If he doesn't soon then I'm OK
>> to merge your two patches.
>>
>
> Yeah we need to restart that patch. It's been in my "pending" list for a
> year now it seems.
>
> Curious why it broke things, perhaps device probe is failing when it
> didn't fail before?
>

um, I retested again this morning and it is all good - I was also a bit 
surprised when things failed yesterday  (it seems one of the wires on my 
board was loose, sorry).

So AFAIC your patch addresses the issue in a much generic (better) way 
and there are no regressions on a HiKey board running a 4.4 kernel.

[PATCH 2/2] arm64: dts: set UART1 clock frequency to 150MHz

[Wei Xu]

Hi Jorge,

On 08/07/2016 09:11, Jorge Ramirez-Ortiz wrote:
> Enable support for higher baud rates (up to 3Mbps) in UART1 - required
> for bluetooth transfers.
> 
> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>

Fine to me.
Thanks!

Acked-by: Wei Xu <xuwei5@hisilicon.com>

Best Regards,
Wei

> ---
>  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index e92a30c..27be812 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -55,6 +55,8 @@
>  		};
>  
>  		uart1: uart at f7111000 {
> +			assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
> +			assigned-clock-rates = <150000000>;
>  			status = "ok";
>  		};
>  
> 

[PATCH 1/2] tty: amba-pl011: add support for clock frequency setting via dt

[Stephen Boyd]

On 07/10, Jorge Ramirez Ortiz wrote:
> On 9 July 2016 at 08:42, Jorge Ramirez <jorge.ramirez-ortiz@linaro.org>
> > um, I retested again this morning and it is all good - I was also a bit
> > surprised when things failed yesterday  (it seems one of the wires on my
> > board was loose, sorry).
> >
> > So AFAIC your patch addresses the issue in a much generic (better) way and
> > there are no regressions on a HiKey board running a 4.4 kernel.
> >
> >
> >
> 
> Stephen, will you post your patch again? how do we progress the change set
> (ie your patch & the hikey device tree change)?

Yes I'll post it again today and put it in Russell's patch
tracker soon after that. I assume there isn't any concern with
the patch and it works for you so it would be good to have your
Tested-by too.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 2/2] arm64: dts: set UART1 clock frequency to 150MHz

[Jorge Ramirez]

On 07/11/2016 11:53 AM, Wei Xu wrote:
> Hi Jorge,
>
> On 08/07/2016 09:11, Jorge Ramirez-Ortiz wrote:
>> Enable support for higher baud rates (up to 3Mbps) in UART1 - required
>> for bluetooth transfers.
>>
>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> Fine to me.
> Thanks!
>
> Acked-by: Wei Xu <xuwei5@hisilicon.com>
>
> Best Regards,
> Wei
>
>> ---
>>   arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>> index e92a30c..27be812 100644
>> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>> @@ -55,6 +55,8 @@
>>   		};
>>   
>>   		uart1: uart at f7111000 {
>> +			assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
>> +			assigned-clock-rates = <150000000>;
>>   			status = "ok";
>>   		};
>>   
>>
Wei Xu,

I couldn't find the change upstream. has it been merged?

[PATCH 2/2] arm64: dts: set UART1 clock frequency to 150MHz

[Wei Xu]

On 19/08/2016 07:57, Jorge Ramirez wrote:
> On 07/11/2016 11:53 AM, Wei Xu wrote:
>> Hi Jorge,
>>
>> On 08/07/2016 09:11, Jorge Ramirez-Ortiz wrote:
>>> Enable support for higher baud rates (up to 3Mbps) in UART1 - required
>>> for bluetooth transfers.
>>>
>>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>>> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>> Fine to me.
>> Thanks!
>>
>> Acked-by: Wei Xu <xuwei5@hisilicon.com>
>>
>> Best Regards,
>> Wei
>>
>>> ---
>>>   arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 ++
>>>   1 file changed, 2 insertions(+)
>>>
>>> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>>> index e92a30c..27be812 100644
>>> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>>> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>>> @@ -55,6 +55,8 @@
>>>           };
>>>             uart1: uart at f7111000 {
>>> +            assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
>>> +            assigned-clock-rates = <150000000>;
>>>               status = "ok";
>>>           };
>>>  

Hi Jorge,

> Wei Xu,
> 
> I couldn't find the change upstream. has it been merged?

No.
I thought Mike will pick them.
If nothing need to be change, I will pick up it.

Best Regards,
Wei

> 
> 
> .
> 

[PATCH 2/2] arm64: dts: set UART1 clock frequency to 150MHz

[Jorge Ramirez-Ortiz]

On 08/19/2016 10:29 AM, Wei Xu wrote:
>
> On 19/08/2016 07:57, Jorge Ramirez wrote:
>> On 07/11/2016 11:53 AM, Wei Xu wrote:
>>> Hi Jorge,
>>>
>>> On 08/07/2016 09:11, Jorge Ramirez-Ortiz wrote:
>>>> Enable support for higher baud rates (up to 3Mbps) in UART1 - required
>>>> for bluetooth transfers.
>>>>
>>>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>>>> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>>> Fine to me.
>>> Thanks!
>>>
>>> Acked-by: Wei Xu <xuwei5@hisilicon.com>
>>>
>>> Best Regards,
>>> Wei
>>>
>>>> ---
>>>>    arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 ++
>>>>    1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>>>> index e92a30c..27be812 100644
>>>> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>>>> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
>>>> @@ -55,6 +55,8 @@
>>>>            };
>>>>              uart1: uart at f7111000 {
>>>> +            assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
>>>> +            assigned-clock-rates = <150000000>;
>>>>                status = "ok";
>>>>            };
>>>>   
> Hi Jorge,
>
>> Wei Xu,
>>
>> I couldn't find the change upstream. has it been merged?
> No.
> I thought Mike will pick them.
> If nothing need to be change, I will pick up it.

yes please, AFAIK nothing needs to be changed.

[PATCH 2/2] arm64: dts: set UART1 clock frequency to 150MHz

[Wei Xu]

Hi Jorge,

On 08/07/2016 09:11, Jorge Ramirez-Ortiz wrote:
> Enable support for higher baud rates (up to 3Mbps) in UART1 - required
> for bluetooth transfers.
> 
> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> Tested-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> ---

Applied to the hisi-dt-4.9 branch.
Thanks!

Best Regards,
Wei

>  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index e92a30c..27be812 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -55,6 +55,8 @@
>  		};
>  
>  		uart1: uart at f7111000 {
> +			assigned-clocks = <&sys_ctrl HI6220_UART1_SRC>;
> +			assigned-clock-rates = <150000000>;
>  			status = "ok";
>  		};
>  
>