diff for duplicates of <1449993.dLHmhtoyuX@mexican> diff --git a/a/1.txt b/N1/1.txt index f8ac1ee..eef941f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,9 @@ Hi, -I originally sent this to the linuxppc-dev list thinking Ben H might take it, -however it should go through the appropriate subsystem. Can someone please +I originally sent this to the linuxppc-dev list thinking Ben H might ta= +ke it,=20 +however it should go through the appropriate subsystem. Can someone ple= +ase=20 merge it into the appropriate tree (unless the are problems with it)? Thanks. @@ -11,9 +13,10 @@ Regards, Alistair On Fri, 22 Nov 2013 13:08:30 Alistair Popple wrote: -> This patch adds a SDHCI platform driver for the new IBM PPC476GTR SoC +> This patch adds a SDHCI platform driver for the new IBM PPC476GTR SoC= + > which is on the Akebono board. -> +>=20 > Signed-off-by: Alistair Popple <alistair@popple.id.au> > Cc: Chris Ball <cjb@laptop.org> > Cc: linux-mmc@vger.kernel.org @@ -21,44 +24,47 @@ On Fri, 22 Nov 2013 13:08:30 Alistair Popple wrote: > drivers/mmc/host/Kconfig | 12 ++++++++ > drivers/mmc/host/Makefile | 1 + > drivers/mmc/host/sdhci-of-476gtr.c | 60 -> ++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) +> ++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+= +) > create mode 100644 drivers/mmc/host/sdhci-of-476gtr.c -> +>=20 > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 7fc5099..14210df 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -130,6 +130,18 @@ config MMC_SDHCI_OF_HLWD -> -> If unsure, say N. -> +>=20 +> =09 If unsure, say N. +>=20 > +config MMC_SDHCI_OF_476GTR -> + tristate "SDHCI OF support for the IBM PPC476GTR SoC" -> + depends on MMC_SDHCI_PLTFM -> + depends on PPC_OF -> + help -> + This selects the Secure Digital Host Controller Interface (SDHCI) -> + found on the PPC476GTR SoC. +> +=09tristate "SDHCI OF support for the IBM PPC476GTR SoC" +> +=09depends on MMC_SDHCI_PLTFM +> +=09depends on PPC_OF +> +=09help +> +=09 This selects the Secure Digital Host Controller Interface (SDHC= +I) +> +=09 found on the PPC476GTR SoC. > + -> + If you have a controller with this interface, say Y or M here. +> +=09 If you have a controller with this interface, say Y or M here. > + -> + If unsure, say N. +> +=09 If unsure, say N. > + > config MMC_SDHCI_CNS3XXX -> tristate "SDHCI support on the Cavium Networks CNS3xxx SoC" -> depends on ARCH_CNS3XXX +> =09tristate "SDHCI support on the Cavium Networks CNS3xxx SoC" +> =09depends on ARCH_CNS3XXX > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index c41d0c3..92beff3 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile -> @@ -59,6 +59,7 @@ obj-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o -> obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o -> obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o -> obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o -> +obj-$(CONFIG_MMC_SDHCI_OF_476GTR) += sdhci-of-476gtr.o -> obj-$(CONFIG_MMC_SDHCI_BCM_KONA) += sdhci-bcm-kona.o -> obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o -> +> @@ -59,6 +59,7 @@ obj-$(CONFIG_MMC_SDHCI_DOVE)=09=09+=3D sdhci-dove.o= + +> obj-$(CONFIG_MMC_SDHCI_TEGRA)=09=09+=3D sdhci-tegra.o +> obj-$(CONFIG_MMC_SDHCI_OF_ESDHC)=09+=3D sdhci-of-esdhc.o +> obj-$(CONFIG_MMC_SDHCI_OF_HLWD)=09=09+=3D sdhci-of-hlwd.o +> +obj-$(CONFIG_MMC_SDHCI_OF_476GTR)=09+=3D sdhci-of-476gtr.o +> obj-$(CONFIG_MMC_SDHCI_BCM_KONA)=09+=3D sdhci-bcm-kona.o +> obj-$(CONFIG_MMC_SDHCI_BCM2835)=09=09+=3D sdhci-bcm2835.o +>=20 > diff --git a/drivers/mmc/host/sdhci-of-476gtr.c > b/drivers/mmc/host/sdhci-of-476gtr.c new file mode 100644 > index 0000000..1310f8c @@ -68,16 +74,20 @@ On Fri, 22 Nov 2013 13:08:30 Alistair Popple wrote: > +/* > + * drivers/mmc/host/sdhci-of-476gtr.c > + * -> + * Copyright © 2013 Alistair Popple <alistair@popple.id.au> IBM Corporation +> + * Copyright =A9 2013 Alistair Popple <alistair@popple.id.au> IBM Co= +rporation > + * > + * Based on sdhci-of-hlwd.c > + * > + * Copyright (C) 2009 The GameCube Linux Team > + * Copyright (C) 2009 Albert Herranz > + * -> + * 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 +> + * This program is free software; you can redistribute it and/or mod= +ify +> + * 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. > + */ > + @@ -86,38 +96,38 @@ On Fri, 22 Nov 2013 13:08:30 Alistair Popple wrote: > +#include <linux/mmc/host.h> > +#include "sdhci-pltfm.h" > + -> +static const struct sdhci_ops sdhci_476gtr_ops = { +> +static const struct sdhci_ops sdhci_476gtr_ops =3D { > +}; > + -> +static const struct sdhci_pltfm_data sdhci_476gtr_pdata = { -> + .ops = &sdhci_476gtr_ops, +> +static const struct sdhci_pltfm_data sdhci_476gtr_pdata =3D { +> +=09.ops =3D &sdhci_476gtr_ops, > +}; > + > +static int sdhci_476gtr_probe(struct platform_device *pdev) > +{ -> + return sdhci_pltfm_register(pdev, &sdhci_476gtr_pdata, 0); +> +=09return sdhci_pltfm_register(pdev, &sdhci_476gtr_pdata, 0); > +} > + > +static int sdhci_476gtr_remove(struct platform_device *pdev) > +{ -> + return sdhci_pltfm_unregister(pdev); +> +=09return sdhci_pltfm_unregister(pdev); > +} > + -> +static const struct of_device_id sdhci_476gtr_of_match[] = { -> + { .compatible = "ibm,476gtr-sdhci" }, -> + { } +> +static const struct of_device_id sdhci_476gtr_of_match[] =3D { +> +=09{ .compatible =3D "ibm,476gtr-sdhci" }, +> +=09{ } > +}; > +MODULE_DEVICE_TABLE(of, sdhci_476gtr_of_match); > + -> +static struct platform_driver sdhci_476gtr_driver = { -> + .driver = { -> + .name = "sdhci-476gtr", -> + .owner = THIS_MODULE, -> + .of_match_table = sdhci_476gtr_of_match, -> + .pm = SDHCI_PLTFM_PMOPS, -> + }, -> + .probe = sdhci_476gtr_probe, -> + .remove = sdhci_476gtr_remove, +> +static struct platform_driver sdhci_476gtr_driver =3D { +> +=09.driver =3D { +> +=09=09.name =3D "sdhci-476gtr", +> +=09=09.owner =3D THIS_MODULE, +> +=09=09.of_match_table =3D sdhci_476gtr_of_match, +> +=09=09.pm =3D SDHCI_PLTFM_PMOPS, +> +=09}, +> +=09.probe =3D sdhci_476gtr_probe, +> +=09.remove =3D sdhci_476gtr_remove, > +}; > + > +module_platform_driver(sdhci_476gtr_driver); diff --git a/a/content_digest b/N1/content_digest index f7d7ae8..02499aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,14 +6,15 @@ "To\0linuxppc-dev@lists.ozlabs.org" Chris Ball <cjb@laptop.org> " linux-mmc@vger.kernel.org\0" - "Cc\0benh@kernel.crashing.org" - " linuxppc-dev@ozlabs.org\0" + "Cc\0linuxppc-dev@ozlabs.org\0" "\00:1\0" "b\0" "Hi,\n" "\n" - "I originally sent this to the linuxppc-dev list thinking Ben H might take it, \n" - "however it should go through the appropriate subsystem. Can someone please \n" + "I originally sent this to the linuxppc-dev list thinking Ben H might ta=\n" + "ke it,=20\n" + "however it should go through the appropriate subsystem. Can someone ple=\n" + "ase=20\n" "merge it into the appropriate tree (unless the are problems with it)?\n" "\n" "Thanks.\n" @@ -23,9 +24,10 @@ "Alistair\n" "\n" "On Fri, 22 Nov 2013 13:08:30 Alistair Popple wrote:\n" - "> This patch adds a SDHCI platform driver for the new IBM PPC476GTR SoC\n" + "> This patch adds a SDHCI platform driver for the new IBM PPC476GTR SoC=\n" + "\n" "> which is on the Akebono board.\n" - "> \n" + ">=20\n" "> Signed-off-by: Alistair Popple <alistair@popple.id.au>\n" "> Cc: Chris Ball <cjb@laptop.org>\n" "> Cc: linux-mmc@vger.kernel.org\n" @@ -33,44 +35,47 @@ "> drivers/mmc/host/Kconfig | 12 ++++++++\n" "> drivers/mmc/host/Makefile | 1 +\n" "> drivers/mmc/host/sdhci-of-476gtr.c | 60\n" - "> ++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+)\n" + "> ++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+=\n" + ")\n" "> create mode 100644 drivers/mmc/host/sdhci-of-476gtr.c\n" - "> \n" + ">=20\n" "> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig\n" "> index 7fc5099..14210df 100644\n" "> --- a/drivers/mmc/host/Kconfig\n" "> +++ b/drivers/mmc/host/Kconfig\n" "> @@ -130,6 +130,18 @@ config MMC_SDHCI_OF_HLWD\n" - "> \n" - "> \t If unsure, say N.\n" - "> \n" + ">=20\n" + "> =09 If unsure, say N.\n" + ">=20\n" "> +config MMC_SDHCI_OF_476GTR\n" - "> +\ttristate \"SDHCI OF support for the IBM PPC476GTR SoC\"\n" - "> +\tdepends on MMC_SDHCI_PLTFM\n" - "> +\tdepends on PPC_OF\n" - "> +\thelp\n" - "> +\t This selects the Secure Digital Host Controller Interface (SDHCI)\n" - "> +\t found on the PPC476GTR SoC.\n" + "> +=09tristate \"SDHCI OF support for the IBM PPC476GTR SoC\"\n" + "> +=09depends on MMC_SDHCI_PLTFM\n" + "> +=09depends on PPC_OF\n" + "> +=09help\n" + "> +=09 This selects the Secure Digital Host Controller Interface (SDHC=\n" + "I)\n" + "> +=09 found on the PPC476GTR SoC.\n" "> +\n" - "> +\t If you have a controller with this interface, say Y or M here.\n" + "> +=09 If you have a controller with this interface, say Y or M here.\n" "> +\n" - "> +\t If unsure, say N.\n" + "> +=09 If unsure, say N.\n" "> +\n" "> config MMC_SDHCI_CNS3XXX\n" - "> \ttristate \"SDHCI support on the Cavium Networks CNS3xxx SoC\"\n" - "> \tdepends on ARCH_CNS3XXX\n" + "> =09tristate \"SDHCI support on the Cavium Networks CNS3xxx SoC\"\n" + "> =09depends on ARCH_CNS3XXX\n" "> diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile\n" "> index c41d0c3..92beff3 100644\n" "> --- a/drivers/mmc/host/Makefile\n" "> +++ b/drivers/mmc/host/Makefile\n" - "> @@ -59,6 +59,7 @@ obj-$(CONFIG_MMC_SDHCI_DOVE)\t\t+= sdhci-dove.o\n" - "> obj-$(CONFIG_MMC_SDHCI_TEGRA)\t\t+= sdhci-tegra.o\n" - "> obj-$(CONFIG_MMC_SDHCI_OF_ESDHC)\t+= sdhci-of-esdhc.o\n" - "> obj-$(CONFIG_MMC_SDHCI_OF_HLWD)\t\t+= sdhci-of-hlwd.o\n" - "> +obj-$(CONFIG_MMC_SDHCI_OF_476GTR)\t+= sdhci-of-476gtr.o\n" - "> obj-$(CONFIG_MMC_SDHCI_BCM_KONA)\t+= sdhci-bcm-kona.o\n" - "> obj-$(CONFIG_MMC_SDHCI_BCM2835)\t\t+= sdhci-bcm2835.o\n" - "> \n" + "> @@ -59,6 +59,7 @@ obj-$(CONFIG_MMC_SDHCI_DOVE)=09=09+=3D sdhci-dove.o=\n" + "\n" + "> obj-$(CONFIG_MMC_SDHCI_TEGRA)=09=09+=3D sdhci-tegra.o\n" + "> obj-$(CONFIG_MMC_SDHCI_OF_ESDHC)=09+=3D sdhci-of-esdhc.o\n" + "> obj-$(CONFIG_MMC_SDHCI_OF_HLWD)=09=09+=3D sdhci-of-hlwd.o\n" + "> +obj-$(CONFIG_MMC_SDHCI_OF_476GTR)=09+=3D sdhci-of-476gtr.o\n" + "> obj-$(CONFIG_MMC_SDHCI_BCM_KONA)=09+=3D sdhci-bcm-kona.o\n" + "> obj-$(CONFIG_MMC_SDHCI_BCM2835)=09=09+=3D sdhci-bcm2835.o\n" + ">=20\n" "> diff --git a/drivers/mmc/host/sdhci-of-476gtr.c\n" "> b/drivers/mmc/host/sdhci-of-476gtr.c new file mode 100644\n" "> index 0000000..1310f8c\n" @@ -80,16 +85,20 @@ "> +/*\n" "> + * drivers/mmc/host/sdhci-of-476gtr.c\n" "> + *\n" - "> + * Copyright \302\251 2013 Alistair Popple <alistair@popple.id.au> IBM Corporation\n" + "> + * Copyright =A9 2013 Alistair Popple <alistair@popple.id.au> IBM Co=\n" + "rporation\n" "> + *\n" "> + * Based on sdhci-of-hlwd.c\n" "> + *\n" "> + * Copyright (C) 2009 The GameCube Linux Team\n" "> + * Copyright (C) 2009 Albert Herranz\n" "> + *\n" - "> + * This program is free software; you can redistribute it and/or modify\n" - "> + * it under the terms of the GNU General Public License as published by\n" - "> + * the Free Software Foundation; either version 2 of the License, or (at\n" + "> + * This program is free software; you can redistribute it and/or mod=\n" + "ify\n" + "> + * it under the terms of the GNU General Public License as published=\n" + " by\n" + "> + * the Free Software Foundation; either version 2 of the License, or=\n" + " (at\n" "> + * your option) any later version.\n" "> + */\n" "> +\n" @@ -98,38 +107,38 @@ "> +#include <linux/mmc/host.h>\n" "> +#include \"sdhci-pltfm.h\"\n" "> +\n" - "> +static const struct sdhci_ops sdhci_476gtr_ops = {\n" + "> +static const struct sdhci_ops sdhci_476gtr_ops =3D {\n" "> +};\n" "> +\n" - "> +static const struct sdhci_pltfm_data sdhci_476gtr_pdata = {\n" - "> +\t.ops = &sdhci_476gtr_ops,\n" + "> +static const struct sdhci_pltfm_data sdhci_476gtr_pdata =3D {\n" + "> +=09.ops =3D &sdhci_476gtr_ops,\n" "> +};\n" "> +\n" "> +static int sdhci_476gtr_probe(struct platform_device *pdev)\n" "> +{\n" - "> +\treturn sdhci_pltfm_register(pdev, &sdhci_476gtr_pdata, 0);\n" + "> +=09return sdhci_pltfm_register(pdev, &sdhci_476gtr_pdata, 0);\n" "> +}\n" "> +\n" "> +static int sdhci_476gtr_remove(struct platform_device *pdev)\n" "> +{\n" - "> +\treturn sdhci_pltfm_unregister(pdev);\n" + "> +=09return sdhci_pltfm_unregister(pdev);\n" "> +}\n" "> +\n" - "> +static const struct of_device_id sdhci_476gtr_of_match[] = {\n" - "> +\t{ .compatible = \"ibm,476gtr-sdhci\" },\n" - "> +\t{ }\n" + "> +static const struct of_device_id sdhci_476gtr_of_match[] =3D {\n" + "> +=09{ .compatible =3D \"ibm,476gtr-sdhci\" },\n" + "> +=09{ }\n" "> +};\n" "> +MODULE_DEVICE_TABLE(of, sdhci_476gtr_of_match);\n" "> +\n" - "> +static struct platform_driver sdhci_476gtr_driver = {\n" - "> +\t.driver = {\n" - "> +\t\t.name = \"sdhci-476gtr\",\n" - "> +\t\t.owner = THIS_MODULE,\n" - "> +\t\t.of_match_table = sdhci_476gtr_of_match,\n" - "> +\t\t.pm = SDHCI_PLTFM_PMOPS,\n" - "> +\t},\n" - "> +\t.probe = sdhci_476gtr_probe,\n" - "> +\t.remove = sdhci_476gtr_remove,\n" + "> +static struct platform_driver sdhci_476gtr_driver =3D {\n" + "> +=09.driver =3D {\n" + "> +=09=09.name =3D \"sdhci-476gtr\",\n" + "> +=09=09.owner =3D THIS_MODULE,\n" + "> +=09=09.of_match_table =3D sdhci_476gtr_of_match,\n" + "> +=09=09.pm =3D SDHCI_PLTFM_PMOPS,\n" + "> +=09},\n" + "> +=09.probe =3D sdhci_476gtr_probe,\n" + "> +=09.remove =3D sdhci_476gtr_remove,\n" "> +};\n" "> +\n" "> +module_platform_driver(sdhci_476gtr_driver);\n" @@ -138,4 +147,4 @@ "> +MODULE_AUTHOR(\"Alistair Popple\");\n" "> +MODULE_LICENSE(\"GPL v2\");" -967c945062e6e103b56a38c19a681cb8a73ad711957b83c8f576caf5c19ebb14 +285d79432841594572c258589dfcb3e49c80fc9e7671d456637573b43f43778c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.