| Message ID | 1404745988-32558-6-git-send-email-matthias.bgg@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/07/2014 05:13 PM, Matthias Brugger wrote: > This adds a generic devicetree board file and a dtsi for boards > based on MT6589 SoCs from Mediatek. > > Apart from the generic parts (gic, clocks) the only component > currently supported are the timers. > > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > -- I will take this patchset through my tree but this patch touches an area I am not handling. Olof, Arnd, do you mind to ack this patch ? Thanks ! -- Daniel
Hi Daniel, Am Freitag, 18. Juli 2014, 11:46:51 schrieb Daniel Lezcano: > On 07/07/2014 05:13 PM, Matthias Brugger wrote: > > This adds a generic devicetree board file and a dtsi for boards > > based on MT6589 SoCs from Mediatek. > > > > Apart from the generic parts (gic, clocks) the only component > > currently supported are the timers. > > > > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > > -- > > I will take this patchset through my tree but this patch touches an area > I am not handling. > > Olof, Arnd, do you mind to ack this patch ? wouldn't it be easier to just take patches 1,2,3,4 through your tree and let patches 5,6,7 go through arm-soc? There is no compile-time dependency between the two parts, so they will come together nicely in linux-next and during the merge-window. Also in [0] Olof wrote: ---------- Traditionally we usually take the DT changes through arm-soc, but as long as we share the branch we might be ok. We tend to stick them in different branches in our tree though, so rockchip will be a little mis-sorted this release. Not a big deal, and we can deal with it. ----------- So I'd assume splitting the patchset this way might be a nice solution? Heiko [0] http://www.spinics.net/lists/arm-kernel/msg347053.html
On 07/18/2014 12:47 PM, Heiko Stübner wrote: > Hi Daniel, > > Am Freitag, 18. Juli 2014, 11:46:51 schrieb Daniel Lezcano: >> On 07/07/2014 05:13 PM, Matthias Brugger wrote: >>> This adds a generic devicetree board file and a dtsi for boards >>> based on MT6589 SoCs from Mediatek. >>> >>> Apart from the generic parts (gic, clocks) the only component >>> currently supported are the timers. >>> >>> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> >>> -- >> >> I will take this patchset through my tree but this patch touches an area >> I am not handling. >> >> Olof, Arnd, do you mind to ack this patch ? > > wouldn't it be easier to just take patches 1,2,3,4 through your tree and let > patches 5,6,7 go through arm-soc? > > There is no compile-time dependency between the two parts, so they will come > together nicely in linux-next and during the merge-window. > > > Also in [0] Olof wrote: > > ---------- > Traditionally we usually take the DT changes through arm-soc, but as > long as we share the branch we might be ok. We tend to stick them in > different branches in our tree though, so rockchip will be a little > mis-sorted this release. Not a big deal, and we can deal with it. > ----------- > > So I'd assume splitting the patchset this way might be a nice solution? > > > Heiko > > > [0] http://www.spinics.net/lists/arm-kernel/msg347053.html Indeed. Olof, Arnd ? Will you take the patches 5-6-7 ?
On 07/18/2014 08:56 PM, Daniel Lezcano wrote: > On 07/18/2014 12:47 PM, Heiko Stübner wrote: >> Hi Daniel, >> >> Am Freitag, 18. Juli 2014, 11:46:51 schrieb Daniel Lezcano: >>> On 07/07/2014 05:13 PM, Matthias Brugger wrote: >>>> This adds a generic devicetree board file and a dtsi for boards >>>> based on MT6589 SoCs from Mediatek. >>>> >>>> Apart from the generic parts (gic, clocks) the only component >>>> currently supported are the timers. >>>> >>>> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> >>>> -- >>> >>> I will take this patchset through my tree but this patch touches an area >>> I am not handling. >>> >>> Olof, Arnd, do you mind to ack this patch ? >> >> wouldn't it be easier to just take patches 1,2,3,4 through your tree >> and let >> patches 5,6,7 go through arm-soc? >> >> There is no compile-time dependency between the two parts, so they >> will come >> together nicely in linux-next and during the merge-window. >> >> >> Also in [0] Olof wrote: >> >> ---------- >> Traditionally we usually take the DT changes through arm-soc, but as >> long as we share the branch we might be ok. We tend to stick them in >> different branches in our tree though, so rockchip will be a little >> mis-sorted this release. Not a big deal, and we can deal with it. >> ----------- >> >> So I'd assume splitting the patchset this way might be a nice solution? >> >> >> Heiko >> >> >> [0] http://www.spinics.net/lists/arm-kernel/msg347053.html > > Indeed. > > Olof, Arnd ? Will you take the patches 5-6-7 ? patches 1-4 applied to my tree. Thanks -- Daniel
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 87b63fd..845c12d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -978,6 +978,8 @@ source "arch/arm/mach-mv78xx0/Kconfig" source "arch/arm/mach-imx/Kconfig" +source "arch/arm/mach-mediatek/Kconfig" + source "arch/arm/mach-mxs/Kconfig" source "arch/arm/mach-netx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6721fab..1895de2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -172,6 +172,7 @@ machine-$(CONFIG_ARCH_MSM) += msm machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_MXC) += imx +machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik diff --git a/arch/arm/boot/dts/mt6589.dtsi b/arch/arm/boot/dts/mt6589.dtsi new file mode 100644 index 0000000..d0297a0 --- /dev/null +++ b/arch/arm/boot/dts/mt6589.dtsi @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2014 MundoReader S.L. + * Author: Matthias Brugger <matthias.bgg@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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,mt6589"; + interrupt-parent = <&gic>; + + 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>; + }; + }; + + soc { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges; + + timer: timer@10008000 { + compatible = "mediatek,mt6577-timer"; + reg = <0x10008000 0x80>; + interrupts = <GIC_SPI 113 IRQ_TYPE_EDGE_RISING>; + clocks = <&system_clk>, <&rtc_clk>; + clock-names = "system-clk", "rtc-clk"; + }; + + gic: interrupt-controller@10212000 { + compatible = "arm,cortex-a15-gic"; + interrupt-controller; + #interrupt-cells = <3>; + reg = <0x10211000 0x1000>, + <0x10212000 0x1000>, + <0x10214000 0x2000>, + <0x10216000 0x2000>; + }; + }; +}; diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig new file mode 100644 index 0000000..2c043a2 --- /dev/null +++ b/arch/arm/mach-mediatek/Kconfig @@ -0,0 +1,6 @@ +config ARCH_MEDIATEK + bool "Mediatek MT6589 SoC" if ARCH_MULTI_V7 + select ARM_GIC + select MTK_TIMER + help + Support for Mediatek Cortex-A7 Quad-Core-SoC MT6589. diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile new file mode 100644 index 0000000..43e619f --- /dev/null +++ b/arch/arm/mach-mediatek/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ARCH_MEDIATEK) += mediatek.o diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/mach-mediatek/mediatek.c new file mode 100644 index 0000000..f2acf07 --- /dev/null +++ b/arch/arm/mach-mediatek/mediatek.c @@ -0,0 +1,27 @@ +/* + * Device Tree support for Mediatek SoCs + * + * Copyright (c) 2014 MundoReader S.L. + * Author: Matthias Brugger <matthias.bgg@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 <linux/init.h> +#include <asm/mach/arch.h> + +static const char * const mediatek_board_dt_compat[] = { + "mediatek,mt6589", + NULL, +}; + +DT_MACHINE_START(MEDIATEK_DT, "Mediatek Cortex-A7 (Device Tree)") + .dt_compat = mediatek_board_dt_compat, +MACHINE_END
This adds a generic devicetree board file and a dtsi for boards based on MT6589 SoCs from Mediatek. Apart from the generic parts (gic, clocks) the only component currently supported are the timers. Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> --- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/boot/dts/mt6589.dtsi | 94 +++++++++++++++++++++++++++++++++++++ arch/arm/mach-mediatek/Kconfig | 6 +++ arch/arm/mach-mediatek/Makefile | 1 + arch/arm/mach-mediatek/mediatek.c | 27 +++++++++++ 6 files changed, 131 insertions(+) create mode 100644 arch/arm/boot/dts/mt6589.dtsi create mode 100644 arch/arm/mach-mediatek/Kconfig create mode 100644 arch/arm/mach-mediatek/Makefile create mode 100644 arch/arm/mach-mediatek/mediatek.c