diff mbox

[2/2] ARM: dts: mediatek: add mt6580 basic support

Message ID 1433319533-24803-3-git-send-email-mars.cheng@mediatek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mars Cheng June 3, 2015, 8:18 a.m. UTC
This enables mt6580 basic support: interrupt, timer & uart.

Signed-off-by: Mars Cheng <mars.cheng@mediatek.com>
---
 arch/arm/boot/dts/Makefile         |   1 +
 arch/arm/boot/dts/mt6580-evbp1.dts |  34 ++++++++++
 arch/arm/boot/dts/mt6580.dtsi      | 130 +++++++++++++++++++++++++++++++++++++
 3 files changed, 165 insertions(+)
 create mode 100644 arch/arm/boot/dts/mt6580-evbp1.dts
 create mode 100644 arch/arm/boot/dts/mt6580.dtsi

Comments

Matthias Brugger June 23, 2015, 7:29 p.m. UTC | #1
On Wednesday, June 03, 2015 04:18:53 PM Mars Cheng wrote:
> This enables mt6580 basic support: interrupt, timer & uart.
> 
> Signed-off-by: Mars Cheng <mars.cheng@mediatek.com>
> ---
>  arch/arm/boot/dts/Makefile         |   1 +
>  arch/arm/boot/dts/mt6580-evbp1.dts |  34 ++++++++++
>  arch/arm/boot/dts/mt6580.dtsi      | 130
> +++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+)
>  create mode 100644 arch/arm/boot/dts/mt6580-evbp1.dts
>  create mode 100644 arch/arm/boot/dts/mt6580.dtsi
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 86217db..9298531 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -656,6 +656,7 @@ dtb-$(CONFIG_MACH_DOVE) += \
>  	dove-d3plug.dtb \
>  	dove-dove-db.dtb
>  dtb-$(CONFIG_ARCH_MEDIATEK) += \
> +	mt6580-evbp1.dtb \
>  	mt6589-aquaris5.dtb \
>  	mt6592-evb.dtb \
>  	mt8127-moose.dtb \
> diff --git a/arch/arm/boot/dts/mt6580-evbp1.dts
> b/arch/arm/boot/dts/mt6580-evbp1.dts new file mode 100644
> index 0000000..fbc0e10
> --- /dev/null
> +++ b/arch/arm/boot/dts/mt6580-evbp1.dts
> @@ -0,0 +1,34 @@
> +/*
> + * Copyright (c) 2015 MediaTek Inc.
> + * Author: Mars.C <mars.cheng@mediatek.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +/dts-v1/;
> +#include "mt6580.dtsi"
> +
> +/ {
> +	model = "MediaTek MT6580 evaluation board";
> +	compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";
> +
> +	chosen {
> +		bootargs = "console=ttyS0,921600n8 root=/dev/ram
> initrd=0x88000000,0x400000 earlyprintk"; +	};

the root and initrd parameters seems really specific for your way you boot the 
board, but are not necessary to boot e.g. with a initramfs.
Please delete this two parameters.

Apart instead of console please use stdout-path to specify to which uart the 
console should be connected.

Thanks,
Matthias

> +
> +	memory {
> +		reg = <0x80000000 0x20000000>;
> +	};
> +};
> +
> +&uart0 {
> +	status = "okay";
> +};
> +
> diff --git a/arch/arm/boot/dts/mt6580.dtsi b/arch/arm/boot/dts/mt6580.dtsi
> new file mode 100644
> index 0000000..de669e2
> --- /dev/null
> +++ b/arch/arm/boot/dts/mt6580.dtsi
> @@ -0,0 +1,130 @@
> +/*
> + * Copyright (c) 2015 MediaTek Inc.
> + * Author: Mars.C <mars.cheng@mediatek.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> +#include "skeleton.dtsi"
> +
> +/ {
> +	compatible = "mediatek,mt6580";
> +	interrupt-parent = <&sysirq>;
> +
> +	cpus {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		cpu@0 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x0>;
> +		};
> +		cpu@1 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x1>;
> +		};
> +		cpu@2 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x2>;
> +		};
> +		cpu@3 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x3>;
> +		};
> +
> +	};
> +
> +	clocks {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		compatible = "simple-bus";
> +		ranges;
> +
> +		system_clk: dummy13m {
> +			compatible = "fixed-clock";
> +			clock-frequency = <13000000>;
> +			#clock-cells = <0>;
> +		};
> +
> +		rtc_clk: dummy32k {
> +			compatible = "fixed-clock";
> +			clock-frequency = <32000>;
> +			#clock-cells = <0>;
> +		};
> +
> +		uart_clk: dummy26m {
> +			compatible = "fixed-clock";
> +			clock-frequency = <26000000>;
> +			#clock-cells = <0>;
> +		};
> +	};
> +
> +	soc {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		compatible = "simple-bus";
> +		ranges;
> +
> +		timer: timer@10008000 {
> +			compatible = "mediatek,mt6580-timer",
> +				     "mediatek,mt6577-timer";
> +			reg = <0x10008000 0x80>;
> +			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_LOW>;
> +			clocks = <&system_clk>, <&rtc_clk>;
> +			clock-names = "system-clk", "rtc-clk";
> +		};
> +
> +		sysirq: interrupt-controller@10200100 {
> +			compatible = "mediatek,mt6580-sysirq",
> +				     "mediatek,mt6577-sysirq";
> +			interrupt-controller;
> +			#interrupt-cells = <3>;
> +			interrupt-parent = <&gic>;
> +			reg = <0x10200100 0x1c>;
> +		};
> +
> +		gic: interrupt-controller@10211000 {
> +			compatible = "arm,cortex-a7-gic";
> +			interrupt-controller;
> +			#interrupt-cells = <3>;
> +			interrupt-parent = <&gic>;
> +			reg = <0x10211000 0x1000>,
> +			      <0x10212000 0x1000>,
> +			      <0x10214000 0x2000>,
> +			      <0x10216000 0x2000>;
> +		};
> +
> +		uart0: serial@11005000 {
> +			compatible = "mediatek,mt6580-uart",
> +				     "mediatek,mt6577-uart";
> +			reg = <0x11005000 0x400>;
> +			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
> +			clocks = <&uart_clk>;
> +			clock-names = "baud";
> +			status = "disabled";
> +		};
> +
> +		uart1: serial@11006000 {
> +			compatible = "mediatek,mt6580-uart",
> +				     "mediatek,mt6577-uart";
> +			reg = <0x11006000 0x400>;
> +			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_LOW>;
> +			clocks = <&uart_clk>;
> +			clock-names = "baud";
> +			status = "disabled";
> +		};
> +	};
> +};
Matthias Brugger June 23, 2015, 7:45 p.m. UTC | #2
On Wednesday, June 03, 2015 04:18:53 PM Mars Cheng wrote:
> This enables mt6580 basic support: interrupt, timer & uart.
> 
> Signed-off-by: Mars Cheng <mars.cheng@mediatek.com>
> ---
>  arch/arm/boot/dts/Makefile         |   1 +
>  arch/arm/boot/dts/mt6580-evbp1.dts |  34 ++++++++++
>  arch/arm/boot/dts/mt6580.dtsi      | 130
> +++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+)
>  create mode 100644 arch/arm/boot/dts/mt6580-evbp1.dts
>  create mode 100644 arch/arm/boot/dts/mt6580.dtsi
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 86217db..9298531 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -656,6 +656,7 @@ dtb-$(CONFIG_MACH_DOVE) += \
>  	dove-d3plug.dtb \
>  	dove-dove-db.dtb
>  dtb-$(CONFIG_ARCH_MEDIATEK) += \
> +	mt6580-evbp1.dtb \
>  	mt6589-aquaris5.dtb \
>  	mt6592-evb.dtb \
>  	mt8127-moose.dtb \
> diff --git a/arch/arm/boot/dts/mt6580-evbp1.dts
> b/arch/arm/boot/dts/mt6580-evbp1.dts new file mode 100644
> index 0000000..fbc0e10
> --- /dev/null
> +++ b/arch/arm/boot/dts/mt6580-evbp1.dts
> @@ -0,0 +1,34 @@
> +/*
> + * Copyright (c) 2015 MediaTek Inc.
> + * Author: Mars.C <mars.cheng@mediatek.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +/dts-v1/;
> +#include "mt6580.dtsi"
> +
> +/ {
> +	model = "MediaTek MT6580 evaluation board";
> +	compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";
> +
> +	chosen {
> +		bootargs = "console=ttyS0,921600n8 root=/dev/ram
> initrd=0x88000000,0x400000 earlyprintk"; +	};
> +
> +	memory {
> +		reg = <0x80000000 0x20000000>;
> +	};
> +};
> +
> +&uart0 {
> +	status = "okay";
> +};
> +
> diff --git a/arch/arm/boot/dts/mt6580.dtsi b/arch/arm/boot/dts/mt6580.dtsi
> new file mode 100644
> index 0000000..de669e2
> --- /dev/null
> +++ b/arch/arm/boot/dts/mt6580.dtsi
> @@ -0,0 +1,130 @@
> +/*
> + * Copyright (c) 2015 MediaTek Inc.
> + * Author: Mars.C <mars.cheng@mediatek.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> +#include "skeleton.dtsi"
> +
> +/ {
> +	compatible = "mediatek,mt6580";
> +	interrupt-parent = <&sysirq>;
> +
> +	cpus {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		cpu@0 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x0>;
> +		};
> +		cpu@1 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x1>;
> +		};
> +		cpu@2 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x2>;
> +		};
> +		cpu@3 {
> +			device_type = "cpu";
> +			compatible = "arm,cortex-a7";
> +			reg = <0x3>;
> +		};
> +
> +	};
> +
> +	clocks {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		compatible = "simple-bus";
> +		ranges;
> +
> +		system_clk: dummy13m {
> +			compatible = "fixed-clock";
> +			clock-frequency = <13000000>;
> +			#clock-cells = <0>;
> +		};
> +
> +		rtc_clk: dummy32k {
> +			compatible = "fixed-clock";
> +			clock-frequency = <32000>;
> +			#clock-cells = <0>;
> +		};
> +
> +		uart_clk: dummy26m {
> +			compatible = "fixed-clock";
> +			clock-frequency = <26000000>;
> +			#clock-cells = <0>;
> +		};
> +	};
> +
> +	soc {

Please drop the soc node as well and just add the components directly.

Thanks,
Matthias
Mars Cheng June 24, 2015, 11:54 a.m. UTC | #3
On Tue, 2015-06-23 at 12:29 -0700, Matthias Brugger wrote:
> On Wednesday, June 03, 2015 04:18:53 PM Mars Cheng wrote:
> > This enables mt6580 basic support: interrupt, timer & uart.
> > 
> > Signed-off-by: Mars Cheng <mars.cheng@mediatek.com>
> > ---
> >  arch/arm/boot/dts/Makefile         |   1 +
> >  arch/arm/boot/dts/mt6580-evbp1.dts |  34 ++++++++++
> >  arch/arm/boot/dts/mt6580.dtsi      | 130
> > +++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+)
> >  create mode 100644 arch/arm/boot/dts/mt6580-evbp1.dts
> >  create mode 100644 arch/arm/boot/dts/mt6580.dtsi
> > 
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index 86217db..9298531 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -656,6 +656,7 @@ dtb-$(CONFIG_MACH_DOVE) += \
> >  	dove-d3plug.dtb \
> >  	dove-dove-db.dtb
> >  dtb-$(CONFIG_ARCH_MEDIATEK) += \
> > +	mt6580-evbp1.dtb \
> >  	mt6589-aquaris5.dtb \
> >  	mt6592-evb.dtb \
> >  	mt8127-moose.dtb \
> > diff --git a/arch/arm/boot/dts/mt6580-evbp1.dts
> > b/arch/arm/boot/dts/mt6580-evbp1.dts new file mode 100644
> > index 0000000..fbc0e10
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/mt6580-evbp1.dts
> > @@ -0,0 +1,34 @@
> > +/*
> > + * Copyright (c) 2015 MediaTek Inc.
> > + * Author: Mars.C <mars.cheng@mediatek.com>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +/dts-v1/;
> > +#include "mt6580.dtsi"
> > +
> > +/ {
> > +	model = "MediaTek MT6580 evaluation board";
> > +	compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";
> > +
> > +	chosen {
> > +		bootargs = "console=ttyS0,921600n8 root=/dev/ram
> > initrd=0x88000000,0x400000 earlyprintk"; +	};
> 
> the root and initrd parameters seems really specific for your way you boot the 
> board, but are not necessary to boot e.g. with a initramfs.
> Please delete this two parameters.
Thanks for this suggestion. I will remove these two parameters in next
version.
> 
> Apart instead of console please use stdout-path to specify to which uart the 
> console should be connected.
Got it, the chosen node in the next version will be:
chosen {
        bootargs = "console=ttyS0,921600n8 earlyprintk";
        stdout-path = &uart0;
};

Thanks.
> 
> Thanks,
> Matthias
> 
> > +
> > +	memory {
> > +		reg = <0x80000000 0x20000000>;
> > +	};
> > +};
> > +
> > +&uart0 {
> > +	status = "okay";
> > +};
> > +
> > diff --git a/arch/arm/boot/dts/mt6580.dtsi b/arch/arm/boot/dts/mt6580.dtsi
> > new file mode 100644
> > index 0000000..de669e2
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/mt6580.dtsi
> > @@ -0,0 +1,130 @@
> > +/*
> > + * Copyright (c) 2015 MediaTek Inc.
> > + * Author: Mars.C <mars.cheng@mediatek.com>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <dt-bindings/interrupt-controller/irq.h>
> > +#include <dt-bindings/interrupt-controller/arm-gic.h>
> > +#include "skeleton.dtsi"
> > +
> > +/ {
> > +	compatible = "mediatek,mt6580";
> > +	interrupt-parent = <&sysirq>;
> > +
> > +	cpus {
> > +		#address-cells = <1>;
> > +		#size-cells = <0>;
> > +
> > +		cpu@0 {
> > +			device_type = "cpu";
> > +			compatible = "arm,cortex-a7";
> > +			reg = <0x0>;
> > +		};
> > +		cpu@1 {
> > +			device_type = "cpu";
> > +			compatible = "arm,cortex-a7";
> > +			reg = <0x1>;
> > +		};
> > +		cpu@2 {
> > +			device_type = "cpu";
> > +			compatible = "arm,cortex-a7";
> > +			reg = <0x2>;
> > +		};
> > +		cpu@3 {
> > +			device_type = "cpu";
> > +			compatible = "arm,cortex-a7";
> > +			reg = <0x3>;
> > +		};
> > +
> > +	};
> > +
> > +	clocks {
> > +		#address-cells = <1>;
> > +		#size-cells = <1>;
> > +		compatible = "simple-bus";
> > +		ranges;
> > +
> > +		system_clk: dummy13m {
> > +			compatible = "fixed-clock";
> > +			clock-frequency = <13000000>;
> > +			#clock-cells = <0>;
> > +		};
> > +
> > +		rtc_clk: dummy32k {
> > +			compatible = "fixed-clock";
> > +			clock-frequency = <32000>;
> > +			#clock-cells = <0>;
> > +		};
> > +
> > +		uart_clk: dummy26m {
> > +			compatible = "fixed-clock";
> > +			clock-frequency = <26000000>;
> > +			#clock-cells = <0>;
> > +		};
> > +	};
> > +
> > +	soc {
> > +		#address-cells = <1>;
> > +		#size-cells = <1>;
> > +		compatible = "simple-bus";
> > +		ranges;
> > +
> > +		timer: timer@10008000 {
> > +			compatible = "mediatek,mt6580-timer",
> > +				     "mediatek,mt6577-timer";
> > +			reg = <0x10008000 0x80>;
> > +			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_LOW>;
> > +			clocks = <&system_clk>, <&rtc_clk>;
> > +			clock-names = "system-clk", "rtc-clk";
> > +		};
> > +
> > +		sysirq: interrupt-controller@10200100 {
> > +			compatible = "mediatek,mt6580-sysirq",
> > +				     "mediatek,mt6577-sysirq";
> > +			interrupt-controller;
> > +			#interrupt-cells = <3>;
> > +			interrupt-parent = <&gic>;
> > +			reg = <0x10200100 0x1c>;
> > +		};
> > +
> > +		gic: interrupt-controller@10211000 {
> > +			compatible = "arm,cortex-a7-gic";
> > +			interrupt-controller;
> > +			#interrupt-cells = <3>;
> > +			interrupt-parent = <&gic>;
> > +			reg = <0x10211000 0x1000>,
> > +			      <0x10212000 0x1000>,
> > +			      <0x10214000 0x2000>,
> > +			      <0x10216000 0x2000>;
> > +		};
> > +
> > +		uart0: serial@11005000 {
> > +			compatible = "mediatek,mt6580-uart",
> > +				     "mediatek,mt6577-uart";
> > +			reg = <0x11005000 0x400>;
> > +			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
> > +			clocks = <&uart_clk>;
> > +			clock-names = "baud";
> > +			status = "disabled";
> > +		};
> > +
> > +		uart1: serial@11006000 {
> > +			compatible = "mediatek,mt6580-uart",
> > +				     "mediatek,mt6577-uart";
> > +			reg = <0x11006000 0x400>;
> > +			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_LOW>;
> > +			clocks = <&uart_clk>;
> > +			clock-names = "baud";
> > +			status = "disabled";
> > +		};
> > +	};
> > +};
>
Mars Cheng June 24, 2015, 11:59 a.m. UTC | #4
On Tue, 2015-06-23 at 21:45 +0200, Matthias Brugger wrote:
> > +	soc {
> 
> Please drop the soc node as well and just add the components directly.
> 
> Thanks,
> Matthias
May I know the reason to remove the soc node? I follow other xxxx.dtsi
to add this node.

Thanks.
Matthias Brugger June 24, 2015, 8:25 p.m. UTC | #5
On Wednesday, June 24, 2015 07:59:13 PM Mars Cheng wrote:
> On Tue, 2015-06-23 at 21:45 +0200, Matthias Brugger wrote:
> > > +	soc {
> > 
> > Please drop the soc node as well and just add the components directly.
> > 
> > Thanks,
> > Matthias
> 
> May I know the reason to remove the soc node? I follow other xxxx.dtsi
> to add this node.

The device tree is reflecting the hardware, if you add a soc node like this, it 
is seen like a bus, but there is not really a bus.

I think point of view about this has change over time and nowadays it is 
preferred not to add a soc node.

Regards,
Matthias
Mars Cheng June 25, 2015, 12:15 a.m. UTC | #6
On Wed, 2015-06-24 at 22:25 +0200, Matthias Brugger wrote:
> On Wednesday, June 24, 2015 07:59:13 PM Mars Cheng wrote:
> > On Tue, 2015-06-23 at 21:45 +0200, Matthias Brugger wrote:
> > > > +	soc {
> > > 
> > > Please drop the soc node as well and just add the components directly.
> > > 
> > > Thanks,
> > > Matthias
> > 
> > May I know the reason to remove the soc node? I follow other xxxx.dtsi
> > to add this node.
> 
> The device tree is reflecting the hardware, if you add a soc node like this, it 
> is seen like a bus, but there is not really a bus.
> 
> I think point of view about this has change over time and nowadays it is 
> preferred not to add a soc node.
> 
> Regards,
> Matthias
Got it. Will remove the soc node and prepare the new patch.

Thanks a lot.
Mars Cheng July 2, 2015, 3:29 a.m. UTC | #7
Hi Matthias

May I double confirm with you that soc node is MUST removed?
If yes, we will upstream dtsi with this format for other new chips.

Thanks.

On Thu, 2015-06-25 at 08:15 +0800, Mars Cheng wrote:
> On Wed, 2015-06-24 at 22:25 +0200, Matthias Brugger wrote:
> > On Wednesday, June 24, 2015 07:59:13 PM Mars Cheng wrote:
> > > On Tue, 2015-06-23 at 21:45 +0200, Matthias Brugger wrote:
> > > > > +	soc {
> > > > 
> > > > Please drop the soc node as well and just add the components directly.
> > > > 
> > > > Thanks,
> > > > Matthias
> > > 
> > > May I know the reason to remove the soc node? I follow other xxxx.dtsi
> > > to add this node.
> > 
> > The device tree is reflecting the hardware, if you add a soc node like this, it 
> > is seen like a bus, but there is not really a bus.
> > 
> > I think point of view about this has change over time and nowadays it is 
> > preferred not to add a soc node.
> > 
> > Regards,
> > Matthias
> Got it. Will remove the soc node and prepare the new patch.
> 
> Thanks a lot.
> 
> 
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
Matthias Brugger July 3, 2015, 1:30 p.m. UTC | #8
On Thursday, July 02, 2015 11:29:01 AM Mars Cheng wrote:
> Hi Matthias
> 
> May I double confirm with you that soc node is MUST removed?
> If yes, we will upstream dtsi with this format for other new chips.

Please don't top post.
Yes, soc node has to be removed.

Cheers,
Matthias
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 86217db..9298531 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -656,6 +656,7 @@  dtb-$(CONFIG_MACH_DOVE) += \
 	dove-d3plug.dtb \
 	dove-dove-db.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += \
+	mt6580-evbp1.dtb \
 	mt6589-aquaris5.dtb \
 	mt6592-evb.dtb \
 	mt8127-moose.dtb \
diff --git a/arch/arm/boot/dts/mt6580-evbp1.dts b/arch/arm/boot/dts/mt6580-evbp1.dts
new file mode 100644
index 0000000..fbc0e10
--- /dev/null
+++ b/arch/arm/boot/dts/mt6580-evbp1.dts
@@ -0,0 +1,34 @@ 
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Mars.C <mars.cheng@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+#include "mt6580.dtsi"
+
+/ {
+	model = "MediaTek MT6580 evaluation board";
+	compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";
+
+	chosen {
+		bootargs = "console=ttyS0,921600n8 root=/dev/ram initrd=0x88000000,0x400000 earlyprintk";
+	};
+
+	memory {
+		reg = <0x80000000 0x20000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
diff --git a/arch/arm/boot/dts/mt6580.dtsi b/arch/arm/boot/dts/mt6580.dtsi
new file mode 100644
index 0000000..de669e2
--- /dev/null
+++ b/arch/arm/boot/dts/mt6580.dtsi
@@ -0,0 +1,130 @@ 
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Mars.C <mars.cheng@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "skeleton.dtsi"
+
+/ {
+	compatible = "mediatek,mt6580";
+	interrupt-parent = <&sysirq>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a7";
+			reg = <0x0>;
+		};
+		cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a7";
+			reg = <0x1>;
+		};
+		cpu@2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a7";
+			reg = <0x2>;
+		};
+		cpu@3 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a7";
+			reg = <0x3>;
+		};
+
+	};
+
+	clocks {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+
+		system_clk: dummy13m {
+			compatible = "fixed-clock";
+			clock-frequency = <13000000>;
+			#clock-cells = <0>;
+		};
+
+		rtc_clk: dummy32k {
+			compatible = "fixed-clock";
+			clock-frequency = <32000>;
+			#clock-cells = <0>;
+		};
+
+		uart_clk: dummy26m {
+			compatible = "fixed-clock";
+			clock-frequency = <26000000>;
+			#clock-cells = <0>;
+		};
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+
+		timer: timer@10008000 {
+			compatible = "mediatek,mt6580-timer",
+				     "mediatek,mt6577-timer";
+			reg = <0x10008000 0x80>;
+			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_LOW>;
+			clocks = <&system_clk>, <&rtc_clk>;
+			clock-names = "system-clk", "rtc-clk";
+		};
+
+		sysirq: interrupt-controller@10200100 {
+			compatible = "mediatek,mt6580-sysirq",
+				     "mediatek,mt6577-sysirq";
+			interrupt-controller;
+			#interrupt-cells = <3>;
+			interrupt-parent = <&gic>;
+			reg = <0x10200100 0x1c>;
+		};
+
+		gic: interrupt-controller@10211000 {
+			compatible = "arm,cortex-a7-gic";
+			interrupt-controller;
+			#interrupt-cells = <3>;
+			interrupt-parent = <&gic>;
+			reg = <0x10211000 0x1000>,
+			      <0x10212000 0x1000>,
+			      <0x10214000 0x2000>,
+			      <0x10216000 0x2000>;
+		};
+
+		uart0: serial@11005000 {
+			compatible = "mediatek,mt6580-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0x11005000 0x400>;
+			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_LOW>;
+			clocks = <&uart_clk>;
+			clock-names = "baud";
+			status = "disabled";
+		};
+
+		uart1: serial@11006000 {
+			compatible = "mediatek,mt6580-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0x11006000 0x400>;
+			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_LOW>;
+			clocks = <&uart_clk>;
+			clock-names = "baud";
+			status = "disabled";
+		};
+	};
+};