| Message ID | 1344977022-29037-1-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 14, 2012 at 10:43:41PM +0200, Sebastian Hesselbarth wrote: > This add a DT compatible board specific setup for the Seagate > FreeAgent Dockstar. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > --- > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > > v2: rebased on git://git.infradead.org/users/jcooper/linux.git fixes-for-v3.6 patches [1/2] and [2/2] of this series applied to: git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7 patch [2/2] depends upon: bda63c1 ARM: Kirkwood: fix Makefile.boot which should be in an upcoming v3.6-rc thx, Jason.
On Tue, Aug 14, 2012 at 07:22:56PM -0400, Jason Cooper wrote: > On Tue, Aug 14, 2012 at 10:43:41PM +0200, Sebastian Hesselbarth wrote: > > This add a DT compatible board specific setup for the Seagate > > FreeAgent Dockstar. > > > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > > --- > > Cc: Jason Cooper <jason@lakedaemon.net> > > Cc: Andrew Lunn <andrew@lunn.ch> > > Cc: Russell King <linux@arm.linux.org.uk> > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-kernel@vger.kernel.org > > > > v2: rebased on git://git.infradead.org/users/jcooper/linux.git fixes-for-v3.6 > > patches [1/2] and [2/2] of this series applied to: > > git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7 > > patch [2/2] depends upon: > > bda63c1 ARM: Kirkwood: fix Makefile.boot > > which should be in an upcoming v3.6-rc Oops, building with both legacy and DT support for the Dockstar yields the following error: arch/arm/mach-kirkwood/dockstar-setup.c:81:20: error: static declaration of 'dockstar_init' follows non-static declaration arch/arm/mach-kirkwood/common.h:86:6: note: previous declaration of 'dockstar_init' was here make[1]: *** [arch/arm/mach-kirkwood/dockstar-setup.o] Error 1 make: *** [arch/arm/mach-kirkwood] Error 2 As a quick fix I renamed your dockstar_init() to dockstar_dt_init() across your patch. This compiles clean. Unfortunately, I can't send this fix up as a separate patch (a bisect may land in between it and yours). Unless I hear otherwise from you in the next day or so, I'm going to collapse the fix into your patch and push it that way. thx, Jason.
On 8/16/12, Jason Cooper <jason@lakedaemon.net> wrote: > Unless I hear otherwise from you in the next day or so, I'm going to > collapse the fix into your patch and push it that way. Jason, please feel free to fix the patch. I am behind corporate firewall ATM and cannot update the patch quickly. Sebastian
On Thu, Aug 16, 2012 at 03:45:00PM +0200, Sebastian Hesselbarth wrote: > On 8/16/12, Jason Cooper <jason@lakedaemon.net> wrote: > > Unless I hear otherwise from you in the next day or so, I'm going to > > collapse the fix into your patch and push it that way. > > please feel free to fix the patch. I am behind corporate firewall ATM > and cannot update the patch quickly. Done. thx, Jason.
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index ca5c15a..4eaeb93 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -94,6 +94,13 @@ config MACH_TS219_DT or MV6282. If you have the wrong one, the buttons will not work. +config MACH_DOCKSTAR_DT + bool "Seagate FreeAgent Dockstar (Flattened Device Tree)" + select ARCH_KIRKWOOD_DT + help + Say 'Y' here if you want your kernel to support the + Seagate FreeAgent Dockstar (Flattened Device Tree). + config MACH_GOFLEXNET_DT bool "Seagate GoFlex Net (Flattened Device Tree)" select ARCH_KIRKWOOD_DT diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile index 055c85a..42e48cf 100644 --- a/arch/arm/mach-kirkwood/Makefile +++ b/arch/arm/mach-kirkwood/Makefile @@ -26,5 +26,6 @@ obj-$(CONFIG_MACH_ICONNECT_DT) += board-iconnect.o obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o +obj-$(CONFIG_MACH_DOCKSTAR_DT) += board-dockstar.o obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o obj-$(CONFIG_MACH_LSXL_DT) += board-lsxl.o diff --git a/arch/arm/mach-kirkwood/board-dockstar.c b/arch/arm/mach-kirkwood/board-dockstar.c new file mode 100644 index 0000000..6b9560b --- /dev/null +++ b/arch/arm/mach-kirkwood/board-dockstar.c @@ -0,0 +1,61 @@ +/* + * arch/arm/mach-kirkwood/board-dockstar.c + * + * Seagate FreeAgent Dockstar Board Init for drivers not converted to + * flattened device tree yet. + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + * + * Copied and modified for Seagate GoFlex Net support by + * Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's + * GoFlex kernel patches. + * + */ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/ata_platform.h> +#include <linux/mv643xx_eth.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_fdt.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/gpio.h> +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/mach/map.h> +#include <mach/kirkwood.h> +#include <mach/bridge-regs.h> +#include <plat/mvsdio.h> +#include "common.h" +#include "mpp.h" + +static struct mv643xx_eth_platform_data dockstar_ge00_data = { + .phy_addr = MV643XX_ETH_PHY_ADDR(0), +}; + +static unsigned int dockstar_mpp_config[] __initdata = { + MPP29_GPIO, /* USB Power Enable */ + MPP46_GPIO, /* LED green */ + MPP47_GPIO, /* LED orange */ + 0 +}; + +void __init dockstar_init(void) +{ + /* + * Basic setup. Needs to be called early. + */ + kirkwood_mpp_conf(dockstar_mpp_config); + + if (gpio_request(29, "USB Power Enable") != 0 || + gpio_direction_output(29, 1) != 0) + pr_err("can't setup GPIO 29 (USB Power Enable)\n"); + kirkwood_ehci_init(); + + kirkwood_ge00_init(&dockstar_ge00_data); +} diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index e4eb450..4693fad 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -81,6 +81,9 @@ static void __init kirkwood_dt_init(void) if (of_machine_is_compatible("qnap,ts219")) qnap_dt_ts219_init(); + if (of_machine_is_compatible("seagate,dockstar")) + dockstar_init(); + if (of_machine_is_compatible("seagate,goflexnet")) goflexnet_init(); @@ -98,6 +101,7 @@ static const char *kirkwood_dt_board_compat[] = { "iom,iconnect", "raidsonic,ib-nas62x0", "qnap,ts219", + "seagate,dockstar", "seagate,goflexnet", "buffalo,lsxl", NULL diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 304dd1a..dc73ff3 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -82,6 +82,12 @@ void ib62x0_init(void); static inline void ib62x0_init(void) {}; #endif +#ifdef CONFIG_MACH_DOCKSTAR_DT +void dockstar_init(void); +#else +static inline void dockstar_init(void) {}; +#endif + #ifdef CONFIG_MACH_GOFLEXNET_DT void goflexnet_init(void); #else
This add a DT compatible board specific setup for the Seagate FreeAgent Dockstar. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org v2: rebased on git://git.infradead.org/users/jcooper/linux.git fixes-for-v3.6 arch/arm/mach-kirkwood/Kconfig | 7 ++++ arch/arm/mach-kirkwood/Makefile | 1 + arch/arm/mach-kirkwood/board-dockstar.c | 61 +++++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/board-dt.c | 4 ++ arch/arm/mach-kirkwood/common.h | 6 +++ 5 files changed, 79 insertions(+) create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c