* [PATCH 0/4] powerpc, mpc5200: add support for a4m072 board @ 2011-06-22 7:55 Heiko Schocher 2011-06-22 7:55 ` [PATCH 1/4] net, phy: am79c874 support Heiko Schocher ` (3 more replies) 0 siblings, 4 replies; 18+ messages in thread From: Heiko Schocher @ 2011-06-22 7:55 UTC (permalink / raw) To: linuxppc-dev; +Cc: Heiko Schocher, Wolfgang Denk - Add PHY support (AMD am79c874) - Add DTS to support a4m072 board - Update mpc5200_defconfig - Add config options needed for a4m072 board support to mpc5200_defconfig cc: Wolfgang Denk <wd@denx.de> Heiko Schocher (4): net, phy: am79c874 support powerpc, mpc5200: add a4m072 board support powerpc, mpc5200: update mpc5200_defconfig powerpc, mpc5200: add options to mpc5200_defconfig arch/powerpc/boot/dts/a4m072.dts | 273 ++++++++++++++++++++++++++ arch/powerpc/configs/mpc5200_defconfig | 15 +- arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + drivers/net/phy/Kconfig | 5 + drivers/net/phy/Makefile | 1 + drivers/net/phy/amd79.c | 109 ++++++++++ 6 files changed, 395 insertions(+), 9 deletions(-) create mode 100644 arch/powerpc/boot/dts/a4m072.dts create mode 100644 drivers/net/phy/amd79.c -- 1.7.5.4 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/4] net, phy: am79c874 support 2011-06-22 7:55 [PATCH 0/4] powerpc, mpc5200: add support for a4m072 board Heiko Schocher @ 2011-06-22 7:55 ` Heiko Schocher 2011-07-26 4:55 ` Heiko Schocher 2012-03-18 21:22 ` Anatolij Gustschin 2011-06-22 7:55 ` [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support Heiko Schocher ` (2 subsequent siblings) 3 siblings, 2 replies; 18+ messages in thread From: Heiko Schocher @ 2011-06-22 7:55 UTC (permalink / raw) To: linuxppc-dev; +Cc: Heiko Schocher, linux-netdev, Wolfgang Denk Signed-off-by: Heiko Schocher <hs@denx.de> cc: linux-netdev@vger.kernel.org cc: Wolfgang Denk <wd@denx.de> --- drivers/net/phy/Kconfig | 5 ++ drivers/net/phy/Makefile | 1 + drivers/net/phy/amd79.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 0 deletions(-) create mode 100644 drivers/net/phy/amd79.c diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index a702443..ee70d04 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -15,6 +15,11 @@ if PHYLIB comment "MII PHY device drivers" +config AMD_PHY + tristate "Drivers for the AMD79 PHYs" + ---help--- + Currently supports the amd79c874 + config MARVELL_PHY tristate "Drivers for Marvell PHYs" ---help--- diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 2333215..79bc8b4 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -23,3 +23,4 @@ obj-$(CONFIG_DP83640_PHY) += dp83640.o obj-$(CONFIG_STE10XP) += ste10Xp.o obj-$(CONFIG_MICREL_PHY) += micrel.o obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o +obj-$(CONFIG_AMD_PHY) += amd79.o diff --git a/drivers/net/phy/amd79.c b/drivers/net/phy/amd79.c new file mode 100644 index 0000000..914d696 --- /dev/null +++ b/drivers/net/phy/amd79.c @@ -0,0 +1,109 @@ +/* + * Driver for AMD am79 PHYs + * + * Author: Heiko Schocher <hs@denx.de> + * + * Copyright (c) 2011 DENX Software Engineering GmbH + * + * 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. + * + */ +#include <linux/kernel.h> +#include <linux/string.h> +#include <linux/errno.h> +#include <linux/unistd.h> +#include <linux/interrupt.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/delay.h> +#include <linux/netdevice.h> +#include <linux/etherdevice.h> +#include <linux/skbuff.h> +#include <linux/spinlock.h> +#include <linux/mm.h> +#include <linux/module.h> +#include <linux/mii.h> +#include <linux/ethtool.h> +#include <linux/phy.h> +#include <linux/uaccess.h> + +#include <asm/irq.h> + +#define MII_AMD79_IR 17 /* Interrupt Status/Control Register */ +#define MII_AMD79_IR_EN_LINK 0x0400 /* IR enable Linkstate */ +#define MII_AMD79_IR_ACK_LINK 0x0004 /* IR ack Linkstate */ + +MODULE_DESCRIPTION("AMD PHY driver"); +MODULE_AUTHOR("Heiko Schocher <hs@denx.de>"); +MODULE_LICENSE("GPL"); + +static int amd79_ack_interrupt(struct phy_device *phydev) +{ + int err; + + err = phy_read(phydev, MII_BMSR); + if (err < 0) + return err; + + err = phy_read(phydev, MII_AMD79_IR); + if (err < 0) + return err; + + return 0; +} + +static int amd79_config_init(struct phy_device *phydev) +{ + int err = 0; + + return err; +} + +static int amd79_config_intr(struct phy_device *phydev) +{ + int err; + + if (phydev->interrupts == PHY_INTERRUPT_ENABLED) + err = phy_write(phydev, MII_AMD79_IR_EN_LINK, + MII_AMD79_IR_EN_LINK); + else + err = phy_write(phydev, MII_AMD79_IR_EN_LINK, 0); + + return err; +} + +static struct phy_driver amd79_driver = { + .phy_id = 0x0022561b, + .name = "AMD79C874", + .phy_id_mask = 0xfffffff0, + .features = PHY_BASIC_FEATURES, + .flags = PHY_HAS_INTERRUPT, + .config_init = amd79_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, + .ack_interrupt = amd79_ack_interrupt, + .config_intr = amd79_config_intr, + .driver = { .owner = THIS_MODULE,}, +}; + +static int __init amd79_init(void) +{ + int ret; + + ret = phy_driver_register(&amd79_driver); + if (ret) + return ret; + + return 0; +} + +static void __exit amd79_exit(void) +{ + phy_driver_unregister(&amd79_driver); +} + +module_init(amd79_init); +module_exit(amd79_exit); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 1/4] net, phy: am79c874 support 2011-06-22 7:55 ` [PATCH 1/4] net, phy: am79c874 support Heiko Schocher @ 2011-07-26 4:55 ` Heiko Schocher 2012-03-18 21:13 ` Anatolij Gustschin 2012-03-18 21:22 ` Anatolij Gustschin 1 sibling, 1 reply; 18+ messages in thread From: Heiko Schocher @ 2011-07-26 4:55 UTC (permalink / raw) To: linuxppc-dev; +Cc: linux-netdev, Wolfgang Denk Hello, Heiko Schocher wrote: > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: linux-netdev@vger.kernel.org > cc: Wolfgang Denk <wd@denx.de> > --- > drivers/net/phy/Kconfig | 5 ++ > drivers/net/phy/Makefile | 1 + > drivers/net/phy/amd79.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 115 insertions(+), 0 deletions(-) > create mode 100644 drivers/net/phy/amd79.c Are there some more comments or is this patch ready for going to mainline? bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/4] net, phy: am79c874 support 2011-07-26 4:55 ` Heiko Schocher @ 2012-03-18 21:13 ` Anatolij Gustschin 0 siblings, 0 replies; 18+ messages in thread From: Anatolij Gustschin @ 2012-03-18 21:13 UTC (permalink / raw) To: hs; +Cc: linuxppc-dev Hello Heiko, On Tue, 26 Jul 2011 06:55:04 +0200 Heiko Schocher <hs@denx.de> wrote: > Hello, > > Heiko Schocher wrote: > > Signed-off-by: Heiko Schocher <hs@denx.de> > > cc: linux-netdev@vger.kernel.org > > cc: Wolfgang Denk <wd@denx.de> > > --- > > drivers/net/phy/Kconfig | 5 ++ > > drivers/net/phy/Makefile | 1 + > > drivers/net/phy/amd79.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 115 insertions(+), 0 deletions(-) > > create mode 100644 drivers/net/phy/amd79.c > > Are there some more comments or is this patch ready for going > to mainline? This patch is not ready yet and it seems it didn't reach the netdev list, probably because of wrong netdev address. I reworked it a bit and have sent a new version to the netdev list. Thanks, Anatolij ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/4] net, phy: am79c874 support 2011-06-22 7:55 ` [PATCH 1/4] net, phy: am79c874 support Heiko Schocher 2011-07-26 4:55 ` Heiko Schocher @ 2012-03-18 21:22 ` Anatolij Gustschin 1 sibling, 0 replies; 18+ messages in thread From: Anatolij Gustschin @ 2012-03-18 21:22 UTC (permalink / raw) To: Heiko Schocher; +Cc: linuxppc-dev Hello Heiko, some comments below. On Wed, 22 Jun 2011 09:55:08 +0200 Heiko Schocher <hs@denx.de> wrote: ... > diff --git a/drivers/net/phy/amd79.c b/drivers/net/phy/amd79.c > new file mode 100644 > index 0000000..914d696 > --- /dev/null > +++ b/drivers/net/phy/amd79.c ... > +#include <linux/kernel.h> > +#include <linux/string.h> > +#include <linux/errno.h> > +#include <linux/unistd.h> > +#include <linux/interrupt.h> > +#include <linux/init.h> > +#include <linux/io.h> > +#include <linux/delay.h> > +#include <linux/netdevice.h> > +#include <linux/etherdevice.h> > +#include <linux/skbuff.h> > +#include <linux/spinlock.h> > +#include <linux/mm.h> > +#include <linux/module.h> > +#include <linux/mii.h> > +#include <linux/ethtool.h> > +#include <linux/phy.h> > +#include <linux/uaccess.h> > + > +#include <asm/irq.h> We should remove not needed headers here. ... > +static int amd79_config_intr(struct phy_device *phydev) > +{ > + int err; > + > + if (phydev->interrupts == PHY_INTERRUPT_ENABLED) > + err = phy_write(phydev, MII_AMD79_IR_EN_LINK, > + MII_AMD79_IR_EN_LINK); > + else > + err = phy_write(phydev, MII_AMD79_IR_EN_LINK, 0); Here is an issue, we should write to the interrupt control/status register, so the 2nd argument of phy_write() should be MII_AMD79_IR. I've fixed this and resubmitted your patch to the netdev list. Thanks, Anatolij ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 7:55 [PATCH 0/4] powerpc, mpc5200: add support for a4m072 board Heiko Schocher 2011-06-22 7:55 ` [PATCH 1/4] net, phy: am79c874 support Heiko Schocher @ 2011-06-22 7:55 ` Heiko Schocher 2011-06-22 8:09 ` Wolfram Sang ` (2 more replies) 2011-06-22 7:55 ` [PATCH 3/4] powerpc, mpc5200: update mpc5200_defconfig Heiko Schocher 2011-06-22 7:55 ` [PATCH 4/4] powerpc, mpc5200: add options to mpc5200_defconfig Heiko Schocher 3 siblings, 3 replies; 18+ messages in thread From: Heiko Schocher @ 2011-06-22 7:55 UTC (permalink / raw) To: linuxppc-dev; +Cc: Heiko Schocher, Wolfgang Denk, devicetree-discuss Signed-off-by: Heiko Schocher <hs@denx.de> cc: Grant Likely <grant.likely@secretlab.ca> cc: devicetree-discuss@ozlabs.org cc: Wolfgang Denk <wd@denx.de> --- For this patchseries following patch is needed: http://patchwork.ozlabs.org/patch/91919/ Grant? Do you have some comments on that patch? arch/powerpc/boot/dts/a4m072.dts | 273 ++++++++++++++++++++++++++ arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + 2 files changed, 274 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/boot/dts/a4m072.dts diff --git a/arch/powerpc/boot/dts/a4m072.dts b/arch/powerpc/boot/dts/a4m072.dts new file mode 100644 index 0000000..cea1c6f --- /dev/null +++ b/arch/powerpc/boot/dts/a4m072.dts @@ -0,0 +1,273 @@ +/* + * a4m072 board Device Tree Source + * + * Copyright (C) 2011 DENX Software Engineering GmbH + * Heiko Schocher <hs@denx.de> + * + * Copyright (C) 2007 Semihalf + * Marian Balakowicz <m8@semihalf.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. + */ + +/dts-v1/; + +/ { + model = "anonymous,a4m072"; + compatible = "anonymous,a4m072"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&mpc5200_pic>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + PowerPC,5200@0 { + device_type = "cpu"; + reg = <0>; + d-cache-line-size = <32>; + i-cache-line-size = <32>; + d-cache-size = <0x4000>; // L1, 16K + i-cache-size = <0x4000>; // L1, 16K + timebase-frequency = <0>; /* From boot loader */ + bus-frequency = <0>; /* From boot loader */ + clock-frequency = <0>; /* From boot loader */ + }; + }; + + memory { + device_type = "memory"; + reg = <0x00000000 0x04000000>; + }; + + soc5200@f0000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,mpc5200b-immr"; + ranges = <0 0xf0000000 0x0000c000>; + reg = <0xf0000000 0x00000100>; + bus-frequency = <0>; /* From boot loader */ + system-frequency = <0>; /* From boot loader */ + + cdm@200 { + compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm"; + reg = <0x200 0x38>; + fsl,ext_48mhz_en = <0x0>; + fsl,fd_enable = <0x01>; + fsl,fd_counters = <0xbbbb>; + }; + + mpc5200_pic: interrupt-controller@500 { + // 5200 interrupts are encoded into two levels; + interrupt-controller; + #interrupt-cells = <3>; + compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic"; + reg = <0x500 0x80>; + }; + + timer@600 { + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; + reg = <0x600 0x80>; + interrupts = <1 9 0>; + fsl,has-wdt; + }; + + gpt3: timer@630 { /* General Purpose Timer in GPIO mode */ + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; + reg = <0x630 0x10>; + interrupts = <1 12 0>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpt4: timer@640 { /* General Purpose Timer in GPIO mode */ + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; + reg = <0x640 0x10>; + interrupts = <1 13 0>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpt5: timer@650 { /* General Purpose Timer in GPIO mode */ + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; + reg = <0x650 0x10>; + interrupts = <1 14 0>; + gpio-controller; + #gpio-cells = <2>; + }; + + can@900 { + compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan"; + interrupts = <2 17 0>; + reg = <0x900 0x80>; + }; + + can@980 { + compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan"; + interrupts = <2 18 0>; + reg = <0x980 0x80>; + }; + + gpio_simple: gpio@b00 { + compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio"; + reg = <0xb00 0x40>; + interrupts = <1 7 0>; + gpio-controller; + #gpio-cells = <2>; + fsl,port_config = <0x19051444>; + }; + + gpio_wkup: gpio@c00 { + compatible = "fsl,mpc5200b-gpio-wkup","fsl,mpc5200-gpio-wkup"; + reg = <0xc00 0x40>; + interrupts = <1 8 0 0 3 0>; + gpio-controller; + #gpio-cells = <2>; + }; + + usb@1000 { + compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be"; + reg = <0x1000 0xff>; + interrupts = <2 6 0>; + }; + + dma-controller@1200 { + compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm"; + reg = <0x1200 0x80>; + interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 + 3 4 0 3 5 0 3 6 0 3 7 0 + 3 8 0 3 9 0 3 10 0 3 11 0 + 3 12 0 3 13 0 3 14 0 3 15 0>; + }; + + xlb@1f00 { + compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb"; + reg = <0x1f00 0x100>; + }; + + psc@2000 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2000 0x100>; + interrupts = <2 1 0>; + }; + + psc@2200 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2200 0x100>; + interrupts = <2 2 0>; + }; + + psc@2400 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2400 0x100>; + interrupts = <2 3 0>; + }; + + psc@2c00 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2c00 0x100>; + interrupts = <2 4 0>; + }; + + ethernet@3000 { + compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec"; + reg = <0x3000 0x400>; + local-mac-address = [ 00 00 00 00 00 00 ]; + interrupts = <2 5 0>; + phy-handle = <&phy0>; + }; + + mdio@3000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio"; + reg = <0x3000 0x400>; + interrupts = <2 5 0>; + + phy0: ethernet-phy@1f { + reg = <0x1f>; + interrupts = <1 2 0>; /* IRQ 2 active low */ + }; + }; + + ata@3a00 { + compatible = "fsl,mpc5200b-ata","fsl,mpc5200-ata"; + reg = <0x3a00 0x100>; + interrupts = <2 7 0>; + }; + + i2c@3d40 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; + reg = <0x3d40 0x40>; + interrupts = <2 16 0>; + + hwmon@2e { + compatible = "nsc,lm87"; + reg = <0x2e>; + }; + rtc@51 { + compatible = "nxp,rtc8564"; + reg = <0x51>; + }; + }; + + sram@8000 { + compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram"; + reg = <0x8000 0x4000>; + }; + }; + + localbus { + compatible = "fsl,mpc5200b-lpb","simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0 0 0xfe000000 0x02000000 + 1 0 0x62000000 0x00400000 + 2 0 0x64000000 0x00200000 + 3 0 0x66000000 0x01000000 + 6 0 0x68000000 0x01000000 + 7 0 0x6a000000 0x00000004 + >; + + flash@0,0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + bank-width = <2>; + #size-cells = <1>; + #address-cells = <1>; + }; + sram0@1,0 { + compatible = "mtd-ram"; + reg = <1 0x00000 0x00400000>; + bank-width = <2>; + }; + }; + + pci@f0000d00 { + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + compatible = "fsl,mpc5200-pci"; + reg = <0xf0000d00 0x100>; + interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map = < + /* IDSEL 0x16 */ + 0xc000 0 0 1 &mpc5200_pic 1 3 3 + 0xc000 0 0 2 &mpc5200_pic 1 3 3 + 0xc000 0 0 3 &mpc5200_pic 1 3 3 + 0xc000 0 0 4 &mpc5200_pic 1 3 3>; + clock-frequency = <0>; /* From boot loader */ + interrupts = <2 8 0 2 9 0 2 10 0>; + bus-range = <0 0>; + ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000 + 0x02000000 0 0x90000000 0x90000000 0 0x10000000 + 0x01000000 0 0x00000000 0xa0000000 0 0x01000000>; + }; +}; diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c index e36d6e2..192b4ff 100644 --- a/arch/powerpc/platforms/52xx/mpc5200_simple.c +++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c @@ -50,6 +50,7 @@ static void __init mpc5200_simple_setup_arch(void) /* list of the supported boards */ static const char *board[] __initdata = { + "anonymous,a4m072", "intercontrol,digsy-mtc", "manroland,mucmc52", "manroland,uc101", -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 7:55 ` [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support Heiko Schocher @ 2011-06-22 8:09 ` Wolfram Sang 2011-06-22 8:13 ` Heiko Schocher 2011-06-22 10:39 ` [PATCH v2 " Heiko Schocher 2011-07-31 4:05 ` [PATCH " Grant Likely 2 siblings, 1 reply; 18+ messages in thread From: Wolfram Sang @ 2011-06-22 8:09 UTC (permalink / raw) To: Heiko Schocher; +Cc: devicetree-discuss, linuxppc-dev, Wolfgang Denk [-- Attachment #1: Type: text/plain, Size: 586 bytes --] On Wed, Jun 22, 2011 at 09:55:09AM +0200, Heiko Schocher wrote: > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: Grant Likely <grant.likely@secretlab.ca> > cc: devicetree-discuss@ozlabs.org > cc: Wolfgang Denk <wd@denx.de> > --- > For this patchseries following patch is needed: > > http://patchwork.ozlabs.org/patch/91919/ > > Grant? Do you have some comments on that patch? Can you use the mpc5200-include? -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 8:09 ` Wolfram Sang @ 2011-06-22 8:13 ` Heiko Schocher 2011-06-22 8:25 ` Wolfram Sang 0 siblings, 1 reply; 18+ messages in thread From: Heiko Schocher @ 2011-06-22 8:13 UTC (permalink / raw) To: Wolfram Sang; +Cc: devicetree-discuss, linuxppc-dev, Wolfgang Denk Hello Wolfram, Wolfram Sang wrote: > On Wed, Jun 22, 2011 at 09:55:09AM +0200, Heiko Schocher wrote: >> Signed-off-by: Heiko Schocher <hs@denx.de> >> cc: Grant Likely <grant.likely@secretlab.ca> >> cc: devicetree-discuss@ozlabs.org >> cc: Wolfgang Denk <wd@denx.de> >> --- >> For this patchseries following patch is needed: >> >> http://patchwork.ozlabs.org/patch/91919/ >> >> Grant? Do you have some comments on that patch? > > Can you use the mpc5200-include? Sorry, cannot parse this ... bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 8:13 ` Heiko Schocher @ 2011-06-22 8:25 ` Wolfram Sang 0 siblings, 0 replies; 18+ messages in thread From: Wolfram Sang @ 2011-06-22 8:25 UTC (permalink / raw) To: Heiko Schocher; +Cc: devicetree-discuss, linuxppc-dev, Wolfgang Denk [-- Attachment #1: Type: text/plain, Size: 366 bytes --] > >> Grant? Do you have some comments on that patch? > > > > Can you use the mpc5200-include? > > Sorry, cannot parse this ... Check other mpc5200-boards, like pcm030: /include/ "mpc5200b.dtsi" -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 7:55 ` [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support Heiko Schocher 2011-06-22 8:09 ` Wolfram Sang @ 2011-06-22 10:39 ` Heiko Schocher 2011-07-26 4:52 ` Heiko Schocher ` (2 more replies) 2011-07-31 4:05 ` [PATCH " Grant Likely 2 siblings, 3 replies; 18+ messages in thread From: Heiko Schocher @ 2011-06-22 10:39 UTC (permalink / raw) To: linuxppc-dev; +Cc: Heiko Schocher, Wolfgang Denk, devicetree-discuss Signed-off-by: Heiko Schocher <hs@denx.de> cc: Grant Likely <grant.likely@secretlab.ca> cc: devicetree-discuss@ozlabs.org cc: Wolfgang Denk <wd@denx.de> cc: Wolfram Sang <w.sang@pengutronix.de> --- For this patchseries following patch is needed: http://patchwork.ozlabs.org/patch/91919/ Grant? Do you have some comments on that patch? changes for v2: add comment from Wolfram Sang: use mpc5200.dtsi arch/powerpc/boot/dts/a4m072.dts | 172 ++++++++++++++++++++++++++ arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + 2 files changed, 173 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/boot/dts/a4m072.dts diff --git a/arch/powerpc/boot/dts/a4m072.dts b/arch/powerpc/boot/dts/a4m072.dts new file mode 100644 index 0000000..adb6746 --- /dev/null +++ b/arch/powerpc/boot/dts/a4m072.dts @@ -0,0 +1,172 @@ +/* + * a4m072 board Device Tree Source + * + * Copyright (C) 2011 DENX Software Engineering GmbH + * Heiko Schocher <hs@denx.de> + * + * Copyright (C) 2007 Semihalf + * Marian Balakowicz <m8@semihalf.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. + */ + +/include/ "mpc5200b.dtsi" + +/ { + model = "anonymous,a4m072"; + compatible = "anonymous,a4m072"; + + soc5200@f0000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,mpc5200b-immr"; + ranges = <0 0xf0000000 0x0000c000>; + reg = <0xf0000000 0x00000100>; + bus-frequency = <0>; /* From boot loader */ + system-frequency = <0>; /* From boot loader */ + + cdm@200 { + fsl,ext_48mhz_en = <0x0>; + fsl,fd_enable = <0x01>; + fsl,fd_counters = <0xbbbb>; + }; + + timer@600 { + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; + reg = <0x600 0x80>; + interrupts = <1 9 0>; + fsl,has-wdt; + }; + + gpt3: timer@630 { /* General Purpose Timer in GPIO mode */ + compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + gpt4: timer@640 { /* General Purpose Timer in GPIO mode */ + compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + gpt5: timer@650 { /* General Purpose Timer in GPIO mode */ + compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + spi@f00 { + status = "disabled"; + }; + + psc@2000 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2000 0x100>; + interrupts = <2 1 0>; + }; + + psc@2200 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2200 0x100>; + interrupts = <2 2 0>; + }; + + psc@2400 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2400 0x100>; + interrupts = <2 3 0>; + }; + + psc@2600 { + status = "disabled"; + }; + + psc@2800 { + status = "disabled"; + }; + + psc@2c00 { + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; + reg = <0x2c00 0x100>; + interrupts = <2 4 0>; + }; + + ethernet@3000 { + phy-handle = <&phy0>; + }; + + mdio@3000 { + phy0: ethernet-phy@1f { + reg = <0x1f>; + interrupts = <1 2 0>; /* IRQ 2 active low */ + }; + }; + + i2c@3d00 { + status = "disabled"; + }; + + i2c@3d40 { + hwmon@2e { + compatible = "nsc,lm87"; + reg = <0x2e>; + }; + rtc@51 { + compatible = "nxp,rtc8564"; + reg = <0x51>; + }; + }; + }; + + localbus { + compatible = "fsl,mpc5200b-lpb","simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0 0 0xfe000000 0x02000000 + 1 0 0x62000000 0x00400000 + 2 0 0x64000000 0x00200000 + 3 0 0x66000000 0x01000000 + 6 0 0x68000000 0x01000000 + 7 0 0x6a000000 0x00000004 + >; + + flash@0,0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + bank-width = <2>; + #size-cells = <1>; + #address-cells = <1>; + }; + sram0@1,0 { + compatible = "mtd-ram"; + reg = <1 0x00000 0x00400000>; + bank-width = <2>; + }; + }; + + pci@f0000d00 { + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + compatible = "fsl,mpc5200-pci"; + reg = <0xf0000d00 0x100>; + interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map = < + /* IDSEL 0x16 */ + 0xc000 0 0 1 &mpc5200_pic 1 3 3 + 0xc000 0 0 2 &mpc5200_pic 1 3 3 + 0xc000 0 0 3 &mpc5200_pic 1 3 3 + 0xc000 0 0 4 &mpc5200_pic 1 3 3>; + clock-frequency = <0>; /* From boot loader */ + interrupts = <2 8 0 2 9 0 2 10 0>; + bus-range = <0 0>; + ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000 + 0x02000000 0 0x90000000 0x90000000 0 0x10000000 + 0x01000000 0 0x00000000 0xa0000000 0 0x01000000>; + }; +}; diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c index e36d6e2..192b4ff 100644 --- a/arch/powerpc/platforms/52xx/mpc5200_simple.c +++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c @@ -50,6 +50,7 @@ static void __init mpc5200_simple_setup_arch(void) /* list of the supported boards */ static const char *board[] __initdata = { + "anonymous,a4m072", "intercontrol,digsy-mtc", "manroland,mucmc52", "manroland,uc101", -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 10:39 ` [PATCH v2 " Heiko Schocher @ 2011-07-26 4:52 ` Heiko Schocher 2011-07-31 4:08 ` Grant Likely 2012-03-18 23:38 ` Anatolij Gustschin 2 siblings, 0 replies; 18+ messages in thread From: Heiko Schocher @ 2011-07-26 4:52 UTC (permalink / raw) To: linuxppc-dev; +Cc: devicetree-discuss, Wolfgang Denk Hello, Heiko Schocher wrote: > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: Grant Likely <grant.likely@secretlab.ca> > cc: devicetree-discuss@ozlabs.org > cc: Wolfgang Denk <wd@denx.de> > cc: Wolfram Sang <w.sang@pengutronix.de> > --- > For this patchseries following patch is needed: > > http://patchwork.ozlabs.org/patch/91919/ > > Grant? Do you have some comments on that patch? > > changes for v2: > add comment from Wolfram Sang: > use mpc5200.dtsi > > arch/powerpc/boot/dts/a4m072.dts | 172 ++++++++++++++++++++++++++ > arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + > 2 files changed, 173 insertions(+), 0 deletions(-) > create mode 100644 arch/powerpc/boot/dts/a4m072.dts Are there some more comments or is this ready for going to mainline? bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 10:39 ` [PATCH v2 " Heiko Schocher 2011-07-26 4:52 ` Heiko Schocher @ 2011-07-31 4:08 ` Grant Likely 2011-08-01 5:30 ` Heiko Schocher 2012-03-18 23:38 ` Anatolij Gustschin 2 siblings, 1 reply; 18+ messages in thread From: Grant Likely @ 2011-07-31 4:08 UTC (permalink / raw) To: Heiko Schocher; +Cc: devicetree-discuss, linuxppc-dev, Wolfgang Denk On Wed, Jun 22, 2011 at 12:39:10PM +0200, Heiko Schocher wrote: > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: Grant Likely <grant.likely@secretlab.ca> > cc: devicetree-discuss@ozlabs.org > cc: Wolfgang Denk <wd@denx.de> > cc: Wolfram Sang <w.sang@pengutronix.de> > --- > For this patchseries following patch is needed: > > http://patchwork.ozlabs.org/patch/91919/ > > Grant? Do you have some comments on that patch? > > changes for v2: > add comment from Wolfram Sang: > use mpc5200.dtsi > > arch/powerpc/boot/dts/a4m072.dts | 172 ++++++++++++++++++++++++++ > arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + > 2 files changed, 173 insertions(+), 0 deletions(-) > create mode 100644 arch/powerpc/boot/dts/a4m072.dts > > diff --git a/arch/powerpc/boot/dts/a4m072.dts b/arch/powerpc/boot/dts/a4m072.dts > new file mode 100644 > index 0000000..adb6746 > --- /dev/null > +++ b/arch/powerpc/boot/dts/a4m072.dts > @@ -0,0 +1,172 @@ > +/* > + * a4m072 board Device Tree Source > + * > + * Copyright (C) 2011 DENX Software Engineering GmbH > + * Heiko Schocher <hs@denx.de> > + * > + * Copyright (C) 2007 Semihalf > + * Marian Balakowicz <m8@semihalf.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. > + */ > + > +/include/ "mpc5200b.dtsi" Ah, I missed this follow up patch. Yes, this is better. > + > +/ { > + model = "anonymous,a4m072"; > + compatible = "anonymous,a4m072"; > + > + soc5200@f0000000 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "fsl,mpc5200b-immr"; > + ranges = <0 0xf0000000 0x0000c000>; > + reg = <0xf0000000 0x00000100>; > + bus-frequency = <0>; /* From boot loader */ > + system-frequency = <0>; /* From boot loader */ > + > + cdm@200 { > + fsl,ext_48mhz_en = <0x0>; > + fsl,fd_enable = <0x01>; > + fsl,fd_counters = <0xbbbb>; Are these new properties documented? They need to be. Also, convention is to use '-' instead of '_' in property names. > + }; > + > + timer@600 { > + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; > + reg = <0x600 0x80>; > + interrupts = <1 9 0>; > + fsl,has-wdt; > + }; Isn't this node already in the mpc5200b.dtsi file? Otherwise, this patch looks pretty good. g. ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/4] powerpc, mpc52xx: add a4m072 board support 2011-07-31 4:08 ` Grant Likely @ 2011-08-01 5:30 ` Heiko Schocher 0 siblings, 0 replies; 18+ messages in thread From: Heiko Schocher @ 2011-08-01 5:30 UTC (permalink / raw) To: Grant Likely; +Cc: devicetree-discuss, linuxppc-dev, Wolfgang Denk Hello Grant, Grant Likely wrote: > On Wed, Jun 22, 2011 at 12:39:10PM +0200, Heiko Schocher wrote: >> Signed-off-by: Heiko Schocher <hs@denx.de> >> cc: Grant Likely <grant.likely@secretlab.ca> >> cc: devicetree-discuss@ozlabs.org >> cc: Wolfgang Denk <wd@denx.de> >> cc: Wolfram Sang <w.sang@pengutronix.de> >> --- >> For this patchseries following patch is needed: >> >> http://patchwork.ozlabs.org/patch/91919/ >> >> Grant? Do you have some comments on that patch? >> >> changes for v2: >> add comment from Wolfram Sang: >> use mpc5200.dtsi >> >> arch/powerpc/boot/dts/a4m072.dts | 172 ++++++++++++++++++++++++++ >> arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + >> 2 files changed, 173 insertions(+), 0 deletions(-) >> create mode 100644 arch/powerpc/boot/dts/a4m072.dts >> >> diff --git a/arch/powerpc/boot/dts/a4m072.dts b/arch/powerpc/boot/dts/a4m072.dts >> new file mode 100644 >> index 0000000..adb6746 >> --- /dev/null >> +++ b/arch/powerpc/boot/dts/a4m072.dts >> @@ -0,0 +1,172 @@ >> +/* >> + * a4m072 board Device Tree Source >> + * >> + * Copyright (C) 2011 DENX Software Engineering GmbH >> + * Heiko Schocher <hs@denx.de> >> + * >> + * Copyright (C) 2007 Semihalf >> + * Marian Balakowicz <m8@semihalf.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. >> + */ >> + >> +/include/ "mpc5200b.dtsi" > > Ah, I missed this follow up patch. Yes, this is better. ;-) >> + >> +/ { >> + model = "anonymous,a4m072"; >> + compatible = "anonymous,a4m072"; The customer don;t want, that his name appear, so I decided here, to use "anonymous" ... what name should used here? >> + >> + soc5200@f0000000 { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "fsl,mpc5200b-immr"; >> + ranges = <0 0xf0000000 0x0000c000>; >> + reg = <0xf0000000 0x00000100>; >> + bus-frequency = <0>; /* From boot loader */ >> + system-frequency = <0>; /* From boot loader */ >> + >> + cdm@200 { >> + fsl,ext_48mhz_en = <0x0>; >> + fsl,fd_enable = <0x01>; >> + fsl,fd_counters = <0xbbbb>; > > Are these new properties documented? They need to be. Also, > convention is to use '-' instead of '_' in property names. Yes, see patch here: >> For this patchseries following patch is needed: >> >> http://patchwork.ozlabs.org/patch/91919/ >> + }; >> + >> + timer@600 { >> + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; >> + reg = <0x600 0x80>; >> + interrupts = <1 9 0>; >> + fsl,has-wdt; >> + }; > > Isn't this node already in the mpc5200b.dtsi file? Yes, you are right, remove this. > Otherwise, this patch looks pretty good. Thanks for your review! I wait for a comment on patch http://patchwork.ozlabs.org/patch/91919/ from you and rework this 2 patches. bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 10:39 ` [PATCH v2 " Heiko Schocher 2011-07-26 4:52 ` Heiko Schocher 2011-07-31 4:08 ` Grant Likely @ 2012-03-18 23:38 ` Anatolij Gustschin 2 siblings, 0 replies; 18+ messages in thread From: Anatolij Gustschin @ 2012-03-18 23:38 UTC (permalink / raw) To: Heiko Schocher; +Cc: devicetree-discuss, linuxppc-dev Hi Heiko, On Wed, 22 Jun 2011 12:39:10 +0200 Heiko Schocher <hs@denx.de> wrote: ... > diff --git a/arch/powerpc/boot/dts/a4m072.dts b/arch/powerpc/boot/dts/a4m072.dts > new file mode 100644 > index 0000000..adb6746 > --- /dev/null > +++ b/arch/powerpc/boot/dts/a4m072.dts ... > + cdm@200 { > + fsl,ext_48mhz_en = <0x0>; > + fsl,fd_enable = <0x01>; > + fsl,fd_counters = <0xbbbb>; When applying this patch I've fixed these properties according to previously added bindings (fsl,init-*-*), but one question remains: is fd-counters value really 0xbbbb? Here, the 3rd bit in each nibble should always be cleared as mentioned in the register description. ... > + timer@600 { > + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; > + reg = <0x600 0x80>; > + interrupts = <1 9 0>; I've removed above three lines as these are already in the dtsi file. Thanks, Anatolij ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support 2011-06-22 7:55 ` [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support Heiko Schocher 2011-06-22 8:09 ` Wolfram Sang 2011-06-22 10:39 ` [PATCH v2 " Heiko Schocher @ 2011-07-31 4:05 ` Grant Likely 2 siblings, 0 replies; 18+ messages in thread From: Grant Likely @ 2011-07-31 4:05 UTC (permalink / raw) To: Heiko Schocher; +Cc: devicetree-discuss, linuxppc-dev, Wolfgang Denk On Wed, Jun 22, 2011 at 09:55:09AM +0200, Heiko Schocher wrote: > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: Grant Likely <grant.likely@secretlab.ca> > cc: devicetree-discuss@ozlabs.org > cc: Wolfgang Denk <wd@denx.de> > --- > For this patchseries following patch is needed: > > http://patchwork.ozlabs.org/patch/91919/ > > Grant? Do you have some comments on that patch? > > arch/powerpc/boot/dts/a4m072.dts | 273 ++++++++++++++++++++++++++ > arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + > 2 files changed, 274 insertions(+), 0 deletions(-) > create mode 100644 arch/powerpc/boot/dts/a4m072.dts > > diff --git a/arch/powerpc/boot/dts/a4m072.dts b/arch/powerpc/boot/dts/a4m072.dts > new file mode 100644 > index 0000000..cea1c6f > --- /dev/null > +++ b/arch/powerpc/boot/dts/a4m072.dts > @@ -0,0 +1,273 @@ > +/* > + * a4m072 board Device Tree Source > + * > + * Copyright (C) 2011 DENX Software Engineering GmbH > + * Heiko Schocher <hs@denx.de> > + * > + * Copyright (C) 2007 Semihalf > + * Marian Balakowicz <m8@semihalf.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. > + */ > + > +/dts-v1/; > + > +/ { > + model = "anonymous,a4m072"; > + compatible = "anonymous,a4m072"; anonymous? This bears some description. Also, 5200b boards can use the mpc5200b.dtsi include file. This one should too. > + #address-cells = <1>; > + #size-cells = <1>; > + interrupt-parent = <&mpc5200_pic>; > + > + cpus { > + #address-cells = <1>; > + #size-cells = <0>; > + > + PowerPC,5200@0 { > + device_type = "cpu"; > + reg = <0>; > + d-cache-line-size = <32>; > + i-cache-line-size = <32>; > + d-cache-size = <0x4000>; // L1, 16K > + i-cache-size = <0x4000>; // L1, 16K > + timebase-frequency = <0>; /* From boot loader */ > + bus-frequency = <0>; /* From boot loader */ > + clock-frequency = <0>; /* From boot loader */ > + }; > + }; > + > + memory { > + device_type = "memory"; > + reg = <0x00000000 0x04000000>; > + }; > + > + soc5200@f0000000 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "fsl,mpc5200b-immr"; > + ranges = <0 0xf0000000 0x0000c000>; > + reg = <0xf0000000 0x00000100>; > + bus-frequency = <0>; /* From boot loader */ > + system-frequency = <0>; /* From boot loader */ > + > + cdm@200 { > + compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm"; > + reg = <0x200 0x38>; > + fsl,ext_48mhz_en = <0x0>; > + fsl,fd_enable = <0x01>; > + fsl,fd_counters = <0xbbbb>; > + }; > + > + mpc5200_pic: interrupt-controller@500 { > + // 5200 interrupts are encoded into two levels; > + interrupt-controller; > + #interrupt-cells = <3>; > + compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic"; > + reg = <0x500 0x80>; > + }; > + > + timer@600 { > + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; > + reg = <0x600 0x80>; > + interrupts = <1 9 0>; > + fsl,has-wdt; > + }; > + > + gpt3: timer@630 { /* General Purpose Timer in GPIO mode */ > + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; > + reg = <0x630 0x10>; > + interrupts = <1 12 0>; > + gpio-controller; > + #gpio-cells = <2>; > + }; > + > + gpt4: timer@640 { /* General Purpose Timer in GPIO mode */ > + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; > + reg = <0x640 0x10>; > + interrupts = <1 13 0>; > + gpio-controller; > + #gpio-cells = <2>; > + }; > + > + gpt5: timer@650 { /* General Purpose Timer in GPIO mode */ > + compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; > + reg = <0x650 0x10>; > + interrupts = <1 14 0>; > + gpio-controller; > + #gpio-cells = <2>; > + }; > + > + can@900 { > + compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan"; > + interrupts = <2 17 0>; > + reg = <0x900 0x80>; > + }; > + > + can@980 { > + compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan"; > + interrupts = <2 18 0>; > + reg = <0x980 0x80>; > + }; > + > + gpio_simple: gpio@b00 { > + compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio"; > + reg = <0xb00 0x40>; > + interrupts = <1 7 0>; > + gpio-controller; > + #gpio-cells = <2>; > + fsl,port_config = <0x19051444>; > + }; > + > + gpio_wkup: gpio@c00 { > + compatible = "fsl,mpc5200b-gpio-wkup","fsl,mpc5200-gpio-wkup"; > + reg = <0xc00 0x40>; > + interrupts = <1 8 0 0 3 0>; > + gpio-controller; > + #gpio-cells = <2>; > + }; > + > + usb@1000 { > + compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be"; > + reg = <0x1000 0xff>; > + interrupts = <2 6 0>; > + }; > + > + dma-controller@1200 { > + compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm"; > + reg = <0x1200 0x80>; > + interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 > + 3 4 0 3 5 0 3 6 0 3 7 0 > + 3 8 0 3 9 0 3 10 0 3 11 0 > + 3 12 0 3 13 0 3 14 0 3 15 0>; > + }; > + > + xlb@1f00 { > + compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb"; > + reg = <0x1f00 0x100>; > + }; > + > + psc@2000 { > + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; > + reg = <0x2000 0x100>; > + interrupts = <2 1 0>; > + }; > + > + psc@2200 { > + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; > + reg = <0x2200 0x100>; > + interrupts = <2 2 0>; > + }; > + > + psc@2400 { > + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; > + reg = <0x2400 0x100>; > + interrupts = <2 3 0>; > + }; > + > + psc@2c00 { > + compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; > + reg = <0x2c00 0x100>; > + interrupts = <2 4 0>; > + }; > + > + ethernet@3000 { > + compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec"; > + reg = <0x3000 0x400>; > + local-mac-address = [ 00 00 00 00 00 00 ]; > + interrupts = <2 5 0>; > + phy-handle = <&phy0>; > + }; > + > + mdio@3000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio"; > + reg = <0x3000 0x400>; > + interrupts = <2 5 0>; > + > + phy0: ethernet-phy@1f { > + reg = <0x1f>; > + interrupts = <1 2 0>; /* IRQ 2 active low */ > + }; > + }; > + > + ata@3a00 { > + compatible = "fsl,mpc5200b-ata","fsl,mpc5200-ata"; > + reg = <0x3a00 0x100>; > + interrupts = <2 7 0>; > + }; > + > + i2c@3d40 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; > + reg = <0x3d40 0x40>; > + interrupts = <2 16 0>; > + > + hwmon@2e { > + compatible = "nsc,lm87"; > + reg = <0x2e>; > + }; > + rtc@51 { > + compatible = "nxp,rtc8564"; > + reg = <0x51>; > + }; > + }; > + > + sram@8000 { > + compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram"; > + reg = <0x8000 0x4000>; > + }; > + }; > + > + localbus { > + compatible = "fsl,mpc5200b-lpb","simple-bus"; > + #address-cells = <2>; > + #size-cells = <1>; > + ranges = <0 0 0xfe000000 0x02000000 > + 1 0 0x62000000 0x00400000 > + 2 0 0x64000000 0x00200000 > + 3 0 0x66000000 0x01000000 > + 6 0 0x68000000 0x01000000 > + 7 0 0x6a000000 0x00000004 > + >; > + > + flash@0,0 { > + compatible = "cfi-flash"; > + reg = <0 0 0x02000000>; > + bank-width = <2>; > + #size-cells = <1>; > + #address-cells = <1>; > + }; > + sram0@1,0 { > + compatible = "mtd-ram"; > + reg = <1 0x00000 0x00400000>; > + bank-width = <2>; > + }; > + }; > + > + pci@f0000d00 { > + #interrupt-cells = <1>; > + #size-cells = <2>; > + #address-cells = <3>; > + device_type = "pci"; > + compatible = "fsl,mpc5200-pci"; > + reg = <0xf0000d00 0x100>; > + interrupt-map-mask = <0xf800 0 0 7>; > + interrupt-map = < > + /* IDSEL 0x16 */ > + 0xc000 0 0 1 &mpc5200_pic 1 3 3 > + 0xc000 0 0 2 &mpc5200_pic 1 3 3 > + 0xc000 0 0 3 &mpc5200_pic 1 3 3 > + 0xc000 0 0 4 &mpc5200_pic 1 3 3>; > + clock-frequency = <0>; /* From boot loader */ > + interrupts = <2 8 0 2 9 0 2 10 0>; > + bus-range = <0 0>; > + ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000 > + 0x02000000 0 0x90000000 0x90000000 0 0x10000000 > + 0x01000000 0 0x00000000 0xa0000000 0 0x01000000>; > + }; > +}; > diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c > index e36d6e2..192b4ff 100644 > --- a/arch/powerpc/platforms/52xx/mpc5200_simple.c > +++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c > @@ -50,6 +50,7 @@ static void __init mpc5200_simple_setup_arch(void) > > /* list of the supported boards */ > static const char *board[] __initdata = { > + "anonymous,a4m072", > "intercontrol,digsy-mtc", > "manroland,mucmc52", > "manroland,uc101", > -- > 1.7.5.4 > ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/4] powerpc, mpc5200: update mpc5200_defconfig 2011-06-22 7:55 [PATCH 0/4] powerpc, mpc5200: add support for a4m072 board Heiko Schocher 2011-06-22 7:55 ` [PATCH 1/4] net, phy: am79c874 support Heiko Schocher 2011-06-22 7:55 ` [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support Heiko Schocher @ 2011-06-22 7:55 ` Heiko Schocher 2011-06-22 7:55 ` [PATCH 4/4] powerpc, mpc5200: add options to mpc5200_defconfig Heiko Schocher 3 siblings, 0 replies; 18+ messages in thread From: Heiko Schocher @ 2011-06-22 7:55 UTC (permalink / raw) To: linuxppc-dev; +Cc: Heiko Schocher, Wolfgang Denk just made a make mpc5200_defconfig make savedefconfig cp defconfig arch/powerpc/configs/mpc5200_defconfig So changes needed in mpc5200_defconfig for a4m072 board support better indicated. Signed-off-by: Heiko Schocher <hs@denx.de> cc: Wolfgang Denk <wd@denx.de> --- arch/powerpc/configs/mpc5200_defconfig | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index e63f537..b3e27f6 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig @@ -1,8 +1,8 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y +CONFIG_SPARSE_IRQ=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set @@ -20,8 +20,6 @@ CONFIG_PPC_BESTCOMM=y CONFIG_SIMPLE_GPIO=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_SPARSE_IRQ=y -CONFIG_PM=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -36,10 +34,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_OF_PARTS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y @@ -115,7 +110,6 @@ CONFIG_RTC_DRV_DS1307=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_INOTIFY=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_PROC_KCORE=y @@ -133,5 +127,4 @@ CONFIG_PRINTK_TIME=y CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/4] powerpc, mpc5200: add options to mpc5200_defconfig 2011-06-22 7:55 [PATCH 0/4] powerpc, mpc5200: add support for a4m072 board Heiko Schocher ` (2 preceding siblings ...) 2011-06-22 7:55 ` [PATCH 3/4] powerpc, mpc5200: update mpc5200_defconfig Heiko Schocher @ 2011-06-22 7:55 ` Heiko Schocher 2012-03-18 23:44 ` Anatolij Gustschin 3 siblings, 1 reply; 18+ messages in thread From: Heiko Schocher @ 2011-06-22 7:55 UTC (permalink / raw) To: linuxppc-dev; +Cc: Heiko Schocher, Wolfgang Denk Add the following options to the mpc5200_defconfig, needed for the a4m072 board support: CONFIG_AMD_PHY=y CONFIG_MTD_PLATRAM=y -> this deletes CONFIG_MTD_RAM=y CONFIG_GPIO_SYSFS=y CONFIG_SENSORS_LM87=m CONFIG_RTC_DRV_PCF8563=m Signed-off-by: Heiko Schocher <hs@denx.de> cc: Wolfgang Denk <wd@denx.de> --- arch/powerpc/configs/mpc5200_defconfig | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index b3e27f6..1e64591 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig @@ -39,9 +39,9 @@ CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_RAM=y CONFIG_MTD_ROM=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_PLATRAM=y CONFIG_MTD_UBI=m CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y @@ -56,6 +56,7 @@ CONFIG_ATA=y CONFIG_PATA_MPC52xx=y CONFIG_PATA_PLATFORM=y CONFIG_NETDEVICES=y +CONFIG_AMD_PHY=y CONFIG_LXT_PHY=y CONFIG_NET_ETHERNET=y CONFIG_FEC_MPC52xx=y @@ -75,6 +76,8 @@ CONFIG_SPI_GPIO=m CONFIG_SPI_MPC52xx=m CONFIG_SPI_MPC52xx_PSC=m CONFIG_SPI_SPIDEV=m +CONFIG_GPIO_SYSFS=y +CONFIG_SENSORS_LM87=m CONFIG_WATCHDOG=y CONFIG_DRM=y CONFIG_VIDEO_OUTPUT_CONTROL=y @@ -107,6 +110,7 @@ CONFIG_USB_STORAGE=y CONFIG_NEW_LEDS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y +CONFIG_RTC_DRV_PCF8563=m CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 4/4] powerpc, mpc5200: add options to mpc5200_defconfig 2011-06-22 7:55 ` [PATCH 4/4] powerpc, mpc5200: add options to mpc5200_defconfig Heiko Schocher @ 2012-03-18 23:44 ` Anatolij Gustschin 0 siblings, 0 replies; 18+ messages in thread From: Anatolij Gustschin @ 2012-03-18 23:44 UTC (permalink / raw) To: Heiko Schocher; +Cc: linuxppc-dev On Wed, 22 Jun 2011 09:55:11 +0200 Heiko Schocher <hs@denx.de> wrote: > Add the following options to the mpc5200_defconfig, needed > for the a4m072 board support: > > CONFIG_AMD_PHY=y > CONFIG_MTD_PLATRAM=y -> this deletes CONFIG_MTD_RAM=y > CONFIG_GPIO_SYSFS=y > CONFIG_SENSORS_LM87=m > CONFIG_RTC_DRV_PCF8563=m > > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: Wolfgang Denk <wd@denx.de> > --- > arch/powerpc/configs/mpc5200_defconfig | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) I squashed both patches (3/4, 4/4) to a single patch when re-basing and applying. Thanks, Anatolij ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2012-03-18 23:44 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-06-22 7:55 [PATCH 0/4] powerpc, mpc5200: add support for a4m072 board Heiko Schocher 2011-06-22 7:55 ` [PATCH 1/4] net, phy: am79c874 support Heiko Schocher 2011-07-26 4:55 ` Heiko Schocher 2012-03-18 21:13 ` Anatolij Gustschin 2012-03-18 21:22 ` Anatolij Gustschin 2011-06-22 7:55 ` [PATCH 2/4] powerpc, mpc52xx: add a4m072 board support Heiko Schocher 2011-06-22 8:09 ` Wolfram Sang 2011-06-22 8:13 ` Heiko Schocher 2011-06-22 8:25 ` Wolfram Sang 2011-06-22 10:39 ` [PATCH v2 " Heiko Schocher 2011-07-26 4:52 ` Heiko Schocher 2011-07-31 4:08 ` Grant Likely 2011-08-01 5:30 ` Heiko Schocher 2012-03-18 23:38 ` Anatolij Gustschin 2011-07-31 4:05 ` [PATCH " Grant Likely 2011-06-22 7:55 ` [PATCH 3/4] powerpc, mpc5200: update mpc5200_defconfig Heiko Schocher 2011-06-22 7:55 ` [PATCH 4/4] powerpc, mpc5200: add options to mpc5200_defconfig Heiko Schocher 2012-03-18 23:44 ` Anatolij Gustschin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).