diff mbox

[v2,2/2] arm: dts: mt2701: add nor flash node

Message ID 1485315515-29942-3-git-send-email-guochun.mao@mediatek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Guochun Mao Jan. 25, 2017, 3:38 a.m. UTC 
Add Mediatek nor flash node.

Signed-off-by: Guochun Mao <guochun.mao@mediatek.com>
---
 arch/arm/boot/dts/mt2701-evb.dts |   25 +++++++++++++++++++++++++
 arch/arm/boot/dts/mt2701.dtsi    |   12 ++++++++++++
 2 files changed, 37 insertions(+)

Comments

Guochun Mao Feb. 5, 2017, 4 a.m. UTC | #1 
On Wed, 2017-01-25 at 11:38 +0800, Guochun Mao wrote:
> Add Mediatek nor flash node.
> 
> Signed-off-by: Guochun Mao <guochun.mao@mediatek.com>
> ---
>  arch/arm/boot/dts/mt2701-evb.dts |   25 +++++++++++++++++++++++++
>  arch/arm/boot/dts/mt2701.dtsi    |   12 ++++++++++++
>  2 files changed, 37 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/mt2701-evb.dts b/arch/arm/boot/dts/mt2701-evb.dts
> index 082ca88..85e5ae8 100644
> --- a/arch/arm/boot/dts/mt2701-evb.dts
> +++ b/arch/arm/boot/dts/mt2701-evb.dts
> @@ -24,6 +24,31 @@
>  	};
>  };
>  
> +&nor_flash {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&nor_pins_default>;
> +	status = "okay";
> +	flash@0 {
> +		compatible = "jedec,spi-nor";
> +		reg = <0>;
> +	};
> +};
> +
> +&pio {
> +	nor_pins_default: nor {
> +		pins1 {
> +			pinmux = <MT2701_PIN_240_EXT_XCS__FUNC_EXT_XCS>,
> +				 <MT2701_PIN_241_EXT_SCK__FUNC_EXT_SCK>,
> +				 <MT2701_PIN_239_EXT_SDIO0__FUNC_EXT_SDIO0>,
> +				 <MT2701_PIN_238_EXT_SDIO1__FUNC_EXT_SDIO1>,
> +				 <MT2701_PIN_237_EXT_SDIO2__FUNC_EXT_SDIO2>,
> +				 <MT2701_PIN_236_EXT_SDIO3__FUNC_EXT_SDIO3>;
> +			drive-strength = <MTK_DRIVE_4mA>;
> +			bias-pull-up;
> +		};
> +	};
> +};
> +
>  &uart0 {
>  	status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
> index bdf8954..1eefce4 100644
> --- a/arch/arm/boot/dts/mt2701.dtsi
> +++ b/arch/arm/boot/dts/mt2701.dtsi
> @@ -227,6 +227,18 @@
>  		status = "disabled";
>  	};
>  
> +	nor_flash: spi@11014000 {
> +		compatible = "mediatek,mt2701-nor",
> +			     "mediatek,mt8173-nor";
> +		reg = <0 0x11014000 0 0xe0>;
> +		clocks = <&pericfg CLK_PERI_FLASH>,
> +			 <&topckgen CLK_TOP_FLASH_SEL>;
> +		clock-names = "spi", "sf";
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		status = "disabled";
> +	};
> +
>  	mmsys: syscon@14000000 {
>  		compatible = "mediatek,mt2701-mmsys", "syscon";
>  		reg = <0 0x14000000 0 0x1000>;

Hi,
mtk-quadspi.txt had been updated as suggested.
Is there suggestion about this patch?
Thanks.

BR,
Guochun
Boris BREZILLON Feb. 6, 2017, 7:45 a.m. UTC | #2 
Hi Guochun,

On Sun, 5 Feb 2017 12:00:49 +0800
Guochun Mao <guochun.mao@mediatek.com> wrote:


> >  
> > +	nor_flash: spi@11014000 {
> > +		compatible = "mediatek,mt2701-nor",
> > +			     "mediatek,mt8173-nor";
> > +		reg = <0 0x11014000 0 0xe0>;
> > +		clocks = <&pericfg CLK_PERI_FLASH>,
> > +			 <&topckgen CLK_TOP_FLASH_SEL>;
> > +		clock-names = "spi", "sf";
> > +		#address-cells = <1>;
> > +		#size-cells = <0>;
> > +		status = "disabled";
> > +	};
> > +
> >  	mmsys: syscon@14000000 {
> >  		compatible = "mediatek,mt2701-mmsys", "syscon";
> >  		reg = <0 0x14000000 0 0x1000>;  
> 
> Hi,
> mtk-quadspi.txt had been updated as suggested.
> Is there suggestion about this patch?

It should probably go through the Mediatek tree. Matthias, any opinion?

Regards,

Boris
Matthias Brugger Feb. 11, 2017, 11:35 p.m. UTC | #3 
On 02/06/2017 08:45 AM, Boris Brezillon wrote:
> Hi Guochun,
>
> On Sun, 5 Feb 2017 12:00:49 +0800
> Guochun Mao <guochun.mao@mediatek.com> wrote:
>
>
>>>
>>> +	nor_flash: spi@11014000 {
>>> +		compatible = "mediatek,mt2701-nor",
>>> +			     "mediatek,mt8173-nor";
>>> +		reg = <0 0x11014000 0 0xe0>;
>>> +		clocks = <&pericfg CLK_PERI_FLASH>,
>>> +			 <&topckgen CLK_TOP_FLASH_SEL>;
>>> +		clock-names = "spi", "sf";
>>> +		#address-cells = <1>;
>>> +		#size-cells = <0>;
>>> +		status = "disabled";
>>> +	};
>>> +
>>>  	mmsys: syscon@14000000 {
>>>  		compatible = "mediatek,mt2701-mmsys", "syscon";
>>>  		reg = <0 0x14000000 0 0x1000>;
>>
>> Hi,
>> mtk-quadspi.txt had been updated as suggested.
>> Is there suggestion about this patch?
>
> It should probably go through the Mediatek tree. Matthias, any opinion?
>

Yes, I will take this one through mine tree.

Thanks,
Matthias
Guochun Mao Feb. 14, 2017, 3:58 a.m. UTC | #4 
On Sun, 2017-02-12 at 07:35 +0800, Matthias Brugger wrote:
> 
> On 02/06/2017 08:45 AM, Boris Brezillon wrote:
> > Hi Guochun,
> >
> > On Sun, 5 Feb 2017 12:00:49 +0800
> > Guochun Mao <guochun.mao@mediatek.com> wrote:
> >
> >
> >>>
> >>> +   nor_flash: spi@11014000 {
> >>> +           compatible = "mediatek,mt2701-nor",
> >>> +                        "mediatek,mt8173-nor";
> >>> +           reg = <0 0x11014000 0 0xe0>;
> >>> +           clocks = <&pericfg CLK_PERI_FLASH>,
> >>> +                    <&topckgen CLK_TOP_FLASH_SEL>;
> >>> +           clock-names = "spi", "sf";
> >>> +           #address-cells = <1>;
> >>> +           #size-cells = <0>;
> >>> +           status = "disabled";
> >>> +   };
> >>> +
> >>>     mmsys: syscon@14000000 {
> >>>             compatible = "mediatek,mt2701-mmsys", "syscon";
> >>>             reg = <0 0x14000000 0 0x1000>;
> >>
> >> Hi,
> >> mtk-quadspi.txt had been updated as suggested.
> >> Is there suggestion about this patch?
> >
> > It should probably go through the Mediatek tree. Matthias, any opinion?
> >
> 
> Yes, I will take this one through mine tree.
> 
> Thanks,
> Matthias

Thanks,
Guochun
Matthias Brugger May 10, 2017, 10:49 a.m. UTC | #5 
On 14/02/17 04:58, Guochun Mao wrote:
> On Sun, 2017-02-12 at 07:35 +0800, Matthias Brugger wrote:
>>
>> On 02/06/2017 08:45 AM, Boris Brezillon wrote:
>>> Hi Guochun,
>>>
>>> On Sun, 5 Feb 2017 12:00:49 +0800
>>> Guochun Mao <guochun.mao@mediatek.com> wrote:
>>>
>>>
>>>>>
>>>>> +   nor_flash: spi@11014000 {
>>>>> +           compatible = "mediatek,mt2701-nor",
>>>>> +                        "mediatek,mt8173-nor";
>>>>> +           reg = <0 0x11014000 0 0xe0>;
>>>>> +           clocks = <&pericfg CLK_PERI_FLASH>,
>>>>> +                    <&topckgen CLK_TOP_FLASH_SEL>;
>>>>> +           clock-names = "spi", "sf";
>>>>> +           #address-cells = <1>;
>>>>> +           #size-cells = <0>;
>>>>> +           status = "disabled";
>>>>> +   };
>>>>> +
>>>>>      mmsys: syscon@14000000 {
>>>>>              compatible = "mediatek,mt2701-mmsys", "syscon";
>>>>>              reg = <0 0x14000000 0 0x1000>;
>>>>
>>>> Hi,
>>>> mtk-quadspi.txt had been updated as suggested.
>>>> Is there suggestion about this patch?
>>>
>>> It should probably go through the Mediatek tree. Matthias, any opinion?
>>>
>>
>> Yes, I will take this one through mine tree.
>>
>> Thanks,
>> Matthias
> 
> Thanks,
> Guochun
> 
> 

Queued now for v4.12-next/dts32
Sorry for the delay.

Matthias
Guochun Mao May 11, 2017, 1:30 a.m. UTC | #6 
On Wed, 2017-05-10 at 12:49 +0200, Matthias Brugger wrote:
> 
> On 14/02/17 04:58, Guochun Mao wrote:
> > On Sun, 2017-02-12 at 07:35 +0800, Matthias Brugger wrote:
> >>
> >> On 02/06/2017 08:45 AM, Boris Brezillon wrote:
> >>> Hi Guochun,
> >>>
> >>> On Sun, 5 Feb 2017 12:00:49 +0800
> >>> Guochun Mao <guochun.mao@mediatek.com> wrote:
> >>>
> >>>
> >>>>>
> >>>>> +   nor_flash: spi@11014000 {
> >>>>> +           compatible = "mediatek,mt2701-nor",
> >>>>> +                        "mediatek,mt8173-nor";
> >>>>> +           reg = <0 0x11014000 0 0xe0>;
> >>>>> +           clocks = <&pericfg CLK_PERI_FLASH>,
> >>>>> +                    <&topckgen CLK_TOP_FLASH_SEL>;
> >>>>> +           clock-names = "spi", "sf";
> >>>>> +           #address-cells = <1>;
> >>>>> +           #size-cells = <0>;
> >>>>> +           status = "disabled";
> >>>>> +   };
> >>>>> +
> >>>>>      mmsys: syscon@14000000 {
> >>>>>              compatible = "mediatek,mt2701-mmsys", "syscon";
> >>>>>              reg = <0 0x14000000 0 0x1000>;
> >>>>
> >>>> Hi,
> >>>> mtk-quadspi.txt had been updated as suggested.
> >>>> Is there suggestion about this patch?
> >>>
> >>> It should probably go through the Mediatek tree. Matthias, any opinion?
> >>>
> >>
> >> Yes, I will take this one through mine tree.
> >>
> >> Thanks,
> >> Matthias
> > 
> > Thanks,
> > Guochun
> > 
> > 
> 
> Queued now for v4.12-next/dts32
> Sorry for the delay.
> 
> Matthias

Hi, Matthias,

It's OK. Thanks a lot.

Guochun
diff mbox

Patch

diff --git a/arch/arm/boot/dts/mt2701-evb.dts b/arch/arm/boot/dts/mt2701-evb.dts
index 082ca88..85e5ae8 100644
--- a/arch/arm/boot/dts/mt2701-evb.dts
+++ b/arch/arm/boot/dts/mt2701-evb.dts
@@ -24,6 +24,31 @@ 
 	};
 };
 
+&nor_flash {
+	pinctrl-names = "default";
+	pinctrl-0 = <&nor_pins_default>;
+	status = "okay";
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+	};
+};
+
+&pio {
+	nor_pins_default: nor {
+		pins1 {
+			pinmux = <MT2701_PIN_240_EXT_XCS__FUNC_EXT_XCS>,
+				 <MT2701_PIN_241_EXT_SCK__FUNC_EXT_SCK>,
+				 <MT2701_PIN_239_EXT_SDIO0__FUNC_EXT_SDIO0>,
+				 <MT2701_PIN_238_EXT_SDIO1__FUNC_EXT_SDIO1>,
+				 <MT2701_PIN_237_EXT_SDIO2__FUNC_EXT_SDIO2>,
+				 <MT2701_PIN_236_EXT_SDIO3__FUNC_EXT_SDIO3>;
+			drive-strength = <MTK_DRIVE_4mA>;
+			bias-pull-up;
+		};
+	};
+};
+
 &uart0 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index bdf8954..1eefce4 100644
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi
@@ -227,6 +227,18 @@ 
 		status = "disabled";
 	};
 
+	nor_flash: spi@11014000 {
+		compatible = "mediatek,mt2701-nor",
+			     "mediatek,mt8173-nor";
+		reg = <0 0x11014000 0 0xe0>;
+		clocks = <&pericfg CLK_PERI_FLASH>,
+			 <&topckgen CLK_TOP_FLASH_SEL>;
+		clock-names = "spi", "sf";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	mmsys: syscon@14000000 {
 		compatible = "mediatek,mt2701-mmsys", "syscon";
 		reg = <0 0x14000000 0 0x1000>;