kernel: Move modifications of b53.h into patch

The b53 driver was added as a dsa driver into the mainline Linux kernel,
but we still use the swconfig based driver. The header file b53.h is
used by both drivers, but the swconfig one needs an extra member, add
this one in a patch to not overwrite the version shipped with the
mainline kernel.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/generic/files/include/linux/platform_data/b53.h b/target/linux/generic/files/include/linux/platform_data/b53.h
deleted file mode 100644 (file)
index 7842741..0000000
--- a/target/linux/generic/files/include/linux/platform_data/b53.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * B53 platform data
- *
- * Copyright (C) 2013 Jonas Gorski <jogo@openwrt.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __B53_H
-#define __B53_H
-
-#include <linux/kernel.h>
-
-struct b53_platform_data {
-       u32 chip_id;
-       u16 enabled_ports;
-
-       /* allow to specify an ethX alias */
-       const char *alias;
-
-       /* only used by MMAP'd driver */
-       unsigned big_endian:1;
-       void __iomem *regs;
-};
-
-#endif

diff --git a/target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch
index 0ec197fbb00cc4fb4e1c728a0b092ea074805ddd..f9df4755008f57edcfeb9eca9fb54b4297271897 100644 (file)
--- a/target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch
+++ b/target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch
@@ -126,3 +126,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  obj-$(CONFIG_MDIO_BCM_IPROC)  += mdio-bcm-iproc.o
  obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o
  obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o
+--- a/include/linux/platform_data/b53.h
++++ b/include/linux/platform_data/b53.h
+@@ -25,6 +25,9 @@ struct b53_platform_data {
+       u32 chip_id;
+       u16 enabled_ports;
+ 
++      /* allow to specify an ethX alias */
++      const char *alias;
++
+       /* only used by MMAP'd driver */
+       unsigned big_endian:1;
+       void __iomem *regs;

diff --git a/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch
index 760ba4fc800928e1f2c4778c687644c289152955..af8840fde2f1bf068d07eb35789e487becde8aae 100644 (file)
--- a/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch
+++ b/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch
@@ -136,3 +136,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  header-y += synclink.h
  header-y += sync_file.h
  header-y += sysctl.h
+--- a/include/linux/platform_data/b53.h
++++ b/include/linux/platform_data/b53.h
+@@ -25,6 +25,9 @@ struct b53_platform_data {
+       u32 chip_id;
+       u16 enabled_ports;
+ 
++      /* allow to specify an ethX alias */
++      const char *alias;
++
+       /* only used by MMAP'd driver */
+       unsigned big_endian:1;
+       void __iomem *regs;

diff --git a/target/linux/generic/pending-3.18/730-phy_b53.patch b/target/linux/generic/pending-3.18/730-phy_b53.patch
index 03fc369c9dd3f2351cd4f49f122315edd0a73447..8137693b3c58ff9701fd49a99ed3fb84854cae92 100644 (file)
--- a/target/linux/generic/pending-3.18/730-phy_b53.patch
+++ b/target/linux/generic/pending-3.18/730-phy_b53.patch
@@ -19,3 +19,42 @@
  obj-$(CONFIG_FIXED_PHY)               += fixed.o
  obj-$(CONFIG_MDIO_BITBANG)    += mdio-bitbang.o
  obj-$(CONFIG_MDIO_GPIO)               += mdio-gpio.o
+--- /dev/null
++++ b/linux/platform_data/b53.h
+@@ -0,0 +1,36 @@
++/*
++ * B53 platform data
++ *
++ * Copyright (C) 2013 Jonas Gorski <jogo@openwrt.org>
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef __B53_H
++#define __B53_H
++
++#include <linux/kernel.h>
++
++struct b53_platform_data {
++      u32 chip_id;
++      u16 enabled_ports;
++
++      /* allow to specify an ethX alias */
++      const char *alias;
++
++      /* only used by MMAP'd driver */
++      unsigned big_endian:1;
++      void __iomem *regs;
++};
++
++#endif