diff mbox

[v8,2/2] arm64: dts: mt8173: Add nor flash node

Message ID 1447817403-16631-3-git-send-email-bayi.cheng@mediatek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Bayi Cheng Nov. 18, 2015, 3:30 a.m. UTC
Add Mediatek nor flash node

Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
 arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

Comments

Matthias Brugger Nov. 25, 2015, 10:50 a.m. UTC | #1
On 18/11/15 04:30, Bayi Cheng wrote:
> Add Mediatek nor flash node
>
> Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
> Acked-by: Brian Norris <computersforpeace@gmail.com>
> ---
>   arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++++++++++++++++-
>   1 file changed, 17 insertions(+), 1 deletion(-)
>

Applied to v4.5-next/dts

Thanks.
Matthias

> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> index 4dd5f93..7988656 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> @@ -387,7 +387,23 @@
>   			status = "disabled";
>   		};
>
> -		i2c3: i2c@11010000 {
> +		nor_flash: spi@1100d000 {
> +			compatible = "mediatek,mt8173-nor";
> +			reg = <0 0x1100d000 0 0xe0>;
> +			clocks = <&pericfg CLK_PERI_SPI>,
> +				 <&topckgen CLK_TOP_SPINFI_IFR_SEL>;
> +			clock-names = "spi", "sf";
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			status = "disabled";
> +
> +			flash@0 {
> +				compatible = "jedec,spi-nor";
> +				reg = <0>;
> +			};
> +		};
> +
> +		i2c3: i2c3@11010000 {
>   			compatible = "mediatek,mt8173-i2c";
>   			reg = <0 0x11010000 0 0x70>,
>   			      <0 0x11000280 0 0x80>;
>
Yingjoe Chen Nov. 25, 2015, 10:57 a.m. UTC | #2
On Wed, 2015-11-25 at 11:50 +0100, Matthias Brugger wrote:
> 
> On 18/11/15 04:30, Bayi Cheng wrote:
> > Add Mediatek nor flash node
> >
> > Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
> > Acked-by: Brian Norris <computersforpeace@gmail.com>
> > ---
> >   arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++++++++++++++++-
> >   1 file changed, 17 insertions(+), 1 deletion(-)
> >
> 
> Applied to v4.5-next/dts
> 
> Thanks.
> Matthias
> 
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > index 4dd5f93..7988656 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > @@ -387,7 +387,23 @@
> >   			status = "disabled";
> >   		};
> >
> > -		i2c3: i2c@11010000 {
> > +		nor_flash: spi@1100d000 {
> > +			compatible = "mediatek,mt8173-nor";
> > +			reg = <0 0x1100d000 0 0xe0>;
> > +			clocks = <&pericfg CLK_PERI_SPI>,
> > +				 <&topckgen CLK_TOP_SPINFI_IFR_SEL>;
> > +			clock-names = "spi", "sf";
> > +			#address-cells = <1>;
> > +			#size-cells = <0>;
> > +			status = "disabled";
> > +
> > +			flash@0 {
> > +				compatible = "jedec,spi-nor";
> > +				reg = <0>;
> > +			};
> > +		};
> > +
> > +		i2c3: i2c3@11010000 {

Hi Matthias,

Just notice this one. Please make sure this line should be

i2c3: i2c@11010000 {

instead of

i2c3: i2c3@11010000 {

Joe.C
Matthias Brugger Nov. 25, 2015, 12:31 p.m. UTC | #3
On 25/11/15 11:57, Yingjoe Chen wrote:
> On Wed, 2015-11-25 at 11:50 +0100, Matthias Brugger wrote:
>>
>> On 18/11/15 04:30, Bayi Cheng wrote:
>>> Add Mediatek nor flash node
>>>
>>> Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
>>> Acked-by: Brian Norris <computersforpeace@gmail.com>
>>> ---
>>>    arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++++++++++++++++-
>>>    1 file changed, 17 insertions(+), 1 deletion(-)
>>>
>>
>> Applied to v4.5-next/dts
>>
>> Thanks.
>> Matthias
>>
>>> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
>>> index 4dd5f93..7988656 100644
>>> --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
>>> +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
>>> @@ -387,7 +387,23 @@
>>>    			status = "disabled";
>>>    		};
>>>
>>> -		i2c3: i2c@11010000 {
>>> +		nor_flash: spi@1100d000 {
>>> +			compatible = "mediatek,mt8173-nor";
>>> +			reg = <0 0x1100d000 0 0xe0>;
>>> +			clocks = <&pericfg CLK_PERI_SPI>,
>>> +				 <&topckgen CLK_TOP_SPINFI_IFR_SEL>;
>>> +			clock-names = "spi", "sf";
>>> +			#address-cells = <1>;
>>> +			#size-cells = <0>;
>>> +			status = "disabled";
>>> +
>>> +			flash@0 {
>>> +				compatible = "jedec,spi-nor";
>>> +				reg = <0>;
>>> +			};
>>> +		};
>>> +
>>> +		i2c3: i2c3@11010000 {
>
> Hi Matthias,
>
> Just notice this one. Please make sure this line should be
>
> i2c3: i2c@11010000 {
>
> instead of
>
> i2c3: i2c3@11010000 {
>

Fixed, thanks for catching this.
Daniel Kurtz Nov. 26, 2015, 1:20 a.m. UTC | #4
Hi Bayi, Matthias,

Sorry for the late review, one comment below...

On Wed, Nov 18, 2015 at 11:30 AM, Bayi Cheng <bayi.cheng@mediatek.com> wrote:
> Add Mediatek nor flash node
>
> Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
> Acked-by: Brian Norris <computersforpeace@gmail.com>
> ---
>  arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> index 4dd5f93..7988656 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> @@ -387,7 +387,23 @@
>                         status = "disabled";
>                 };
>
> -               i2c3: i2c@11010000 {
> +               nor_flash: spi@1100d000 {
> +                       compatible = "mediatek,mt8173-nor";
> +                       reg = <0 0x1100d000 0 0xe0>;
> +                       clocks = <&pericfg CLK_PERI_SPI>,
> +                                <&topckgen CLK_TOP_SPINFI_IFR_SEL>;
> +                       clock-names = "spi", "sf";
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +                       status = "disabled";
> +
> +                       flash@0 {
> +                               compatible = "jedec,spi-nor";
> +                               reg = <0>;
> +                       };

I think this flash@0 node represents the flash device present on the
board and should therefore be moved to the board-specific .dts.

-Dan

> +               };
> +
> +               i2c3: i2c3@11010000 {
>                         compatible = "mediatek,mt8173-i2c";
>                         reg = <0 0x11010000 0 0x70>,
>                               <0 0x11000280 0 0x80>;
> --
> 1.8.1.1.dirty
>
Bayi Cheng Nov. 26, 2015, 2:42 a.m. UTC | #5
On Thu, 2015-11-26 at 09:20 +0800, Daniel Kurtz wrote:
> Hi Bayi, Matthias,
> 
> Sorry for the late review, one comment below...
> 
> On Wed, Nov 18, 2015 at 11:30 AM, Bayi Cheng <bayi.cheng@mediatek.com> wrote:
> > Add Mediatek nor flash node
> >
> > Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
> > Acked-by: Brian Norris <computersforpeace@gmail.com>
> > ---
> >  arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++++++++++++++++-
> >  1 file changed, 17 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > index 4dd5f93..7988656 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > @@ -387,7 +387,23 @@
> >                         status = "disabled";
> >                 };
> >
> > -               i2c3: i2c@11010000 {
> > +               nor_flash: spi@1100d000 {
> > +                       compatible = "mediatek,mt8173-nor";
> > +                       reg = <0 0x1100d000 0 0xe0>;
> > +                       clocks = <&pericfg CLK_PERI_SPI>,
> > +                                <&topckgen CLK_TOP_SPINFI_IFR_SEL>;
> > +                       clock-names = "spi", "sf";
> > +                       #address-cells = <1>;
> > +                       #size-cells = <0>;
> > +                       status = "disabled";
> > +
> > +                       flash@0 {
> > +                               compatible = "jedec,spi-nor";
> > +                               reg = <0>;
> > +                       };
> 
> I think this flash@0 node represents the flash device present on the
> board and should therefore be moved to the board-specific .dts.
> 
> -Dan
> 
Hi Daniel, Thanks for your comments, and I will fixed it in the next
patch.
> > +               };
> > +
> > +               i2c3: i2c3@11010000 {
> >                         compatible = "mediatek,mt8173-i2c";
> >                         reg = <0 0x11010000 0 0x70>,
> >                               <0 0x11000280 0 0x80>;
> > --
> > 1.8.1.1.dirty
> >
Matthias Brugger Dec. 4, 2015, 4:22 p.m. UTC | #6
On 26/11/15 03:42, bayi cheng wrote:
> On Thu, 2015-11-26 at 09:20 +0800, Daniel Kurtz wrote:
>> Hi Bayi, Matthias,
>>
>> Sorry for the late review, one comment below...
>>
>> On Wed, Nov 18, 2015 at 11:30 AM, Bayi Cheng <bayi.cheng@mediatek.com> wrote:
>>> Add Mediatek nor flash node
>>>
>>> Signed-off-by: Bayi Cheng <bayi.cheng@mediatek.com>
>>> Acked-by: Brian Norris <computersforpeace@gmail.com>
>>> ---
>>>   arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++++++++++++++++-
>>>   1 file changed, 17 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
>>> index 4dd5f93..7988656 100644
>>> --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
>>> +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
>>> @@ -387,7 +387,23 @@
>>>                          status = "disabled";
>>>                  };
>>>
>>> -               i2c3: i2c@11010000 {
>>> +               nor_flash: spi@1100d000 {
>>> +                       compatible = "mediatek,mt8173-nor";
>>> +                       reg = <0 0x1100d000 0 0xe0>;
>>> +                       clocks = <&pericfg CLK_PERI_SPI>,
>>> +                                <&topckgen CLK_TOP_SPINFI_IFR_SEL>;
>>> +                       clock-names = "spi", "sf";
>>> +                       #address-cells = <1>;
>>> +                       #size-cells = <0>;
>>> +                       status = "disabled";
>>> +
>>> +                       flash@0 {
>>> +                               compatible = "jedec,spi-nor";
>>> +                               reg = <0>;
>>> +                       };
>>
>> I think this flash@0 node represents the flash device present on the
>> board and should therefore be moved to the board-specific .dts.
>>
>> -Dan
>>

Good catch, thanks.

> Hi Daniel, Thanks for your comments, and I will fixed it in the next
> patch.

Ok, I dropped your patch in the meanwhile.

Regards,
Matthias

>>> +               };
>>> +
>>> +               i2c3: i2c3@11010000 {
>>>                          compatible = "mediatek,mt8173-i2c";
>>>                          reg = <0 0x11010000 0 0x70>,
>>>                                <0 0x11000280 0 0x80>;
>>> --
>>> 1.8.1.1.dirty
>>>
>
>
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 4dd5f93..7988656 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -387,7 +387,23 @@ 
 			status = "disabled";
 		};
 
-		i2c3: i2c@11010000 {
+		nor_flash: spi@1100d000 {
+			compatible = "mediatek,mt8173-nor";
+			reg = <0 0x1100d000 0 0xe0>;
+			clocks = <&pericfg CLK_PERI_SPI>,
+				 <&topckgen CLK_TOP_SPINFI_IFR_SEL>;
+			clock-names = "spi", "sf";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+
+			flash@0 {
+				compatible = "jedec,spi-nor";
+				reg = <0>;
+			};
+		};
+
+		i2c3: i2c3@11010000 {
 			compatible = "mediatek,mt8173-i2c";
 			reg = <0 0x11010000 0 0x70>,
 			      <0 0x11000280 0 0x80>;