Merge pull request #1495 from shawaj/rpi-4.4.y

Change BoomBerry name to JustBoom in all locations due to legal challenge

Author: pelwell

arch/arm/boot/dts/overlays/Makefile

@@ -18,8 +18,6 @@ dtbo-$(RPI_DT_OVERLAYS) += akkordion-iqdacplus.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += at86rf233.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += audioinjector-wm8731-audio.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += bmp085_i2c-sensor.dtbo
-dtbo-$(RPI_DT_OVERLAYS) += boomberry-dac.dtbo
-dtbo-$(RPI_DT_OVERLAYS) += boomberry-digi.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += dpi24.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += dwc2.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += dwc-otg.dtbo
@@ -43,6 +41,8 @@ dtbo-$(RPI_DT_OVERLAYS) += i2s-gpio28-31.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += i2s-mmap.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += iqaudio-dac.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += iqaudio-dacplus.dtbo
+dtbo-$(RPI_DT_OVERLAYS) += justboom-dac.dtbo
+dtbo-$(RPI_DT_OVERLAYS) += justboom-digi.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += lirc-rpi.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += mcp2515-can0.dtbo
 dtbo-$(RPI_DT_OVERLAYS) += mcp2515-can1.dtbo

arch/arm/boot/dts/overlays/README

@@ -238,32 +238,6 @@ Load:   dtoverlay=bmp085_i2c-sensor
 Params: <None>
 
 
-Name:   boomberry-dac
-Info:   Configures the BoomBerry DAC HAT, Amp HAT, DAC Zero and Amp Zero audio
-        cards
-Load:   dtoverlay=boomberry-dac,<param>=<val>
-Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-                                Digital volume control. Enable with
-                                "dtoverlay=boomberry-dac,24db_digital_gain"
-                                (The default behaviour is that the Digital
-                                volume control is limited to a maximum of
-                                0dB. ie. it can attenuate but not provide
-                                gain. For most users, this will be desired
-                                as it will prevent clipping. By appending
-                                the 24dB_digital_gain parameter, the Digital
-                                volume control will allow up to 24dB of
-                                gain. If this parameter is enabled, it is the
-                                responsibility of the user to ensure that
-                                the Digital volume control is set to a value
-                                that does not result in clipping/distortion!)
-
-
-Name:   boomberry-digi
-Info:   Configures the BoomBerry Digi HAT and Digi Zero audio cards
-Load:   dtoverlay=boomberry-digi
-Params: <None>
-
-
 Name:   dht11
 Info:   Overlay for the DHT11/DHT21/DHT22 humidity/temperature sensors
         Also sometimes found with the part number(s) AM230x.
@@ -543,6 +517,32 @@ Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
                                 that does not result in clipping/distortion!)
 
 
+Name:   justboom-dac
+Info:   Configures the JustBoom DAC HAT, Amp HAT, DAC Zero and Amp Zero audio
+        cards
+Load:   dtoverlay=justboom-dac,<param>=<val>
+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
+                                Digital volume control. Enable with
+                                "dtoverlay=justboom-dac,24db_digital_gain"
+                                (The default behaviour is that the Digital
+                                volume control is limited to a maximum of
+                                0dB. ie. it can attenuate but not provide
+                                gain. For most users, this will be desired
+                                as it will prevent clipping. By appending
+                                the 24dB_digital_gain parameter, the Digital
+                                volume control will allow up to 24dB of
+                                gain. If this parameter is enabled, it is the
+                                responsibility of the user to ensure that
+                                the Digital volume control is set to a value
+                                that does not result in clipping/distortion!)
+
+
+Name:   justboom-digi
+Info:   Configures the JustBoom Digi HAT and Digi Zero audio cards
+Load:   dtoverlay=justboom-digi
+Params: <None>
+
+
 Name:   lirc-rpi
 Info:   Configures lirc-rpi (Linux Infrared Remote Control for Raspberry Pi)
         Consult the module documentation for more details.

arch/arm/boot/dts/overlays/boomberry-dac-overlay.dts renamed to arch/arm/boot/dts/overlays/justboom-dac-overlay.dts

@@ -1,4 +1,4 @@
-// Definitions for BoomBerry DAC
+// Definitions for JustBoom DAC
 /dts-v1/;
 /plugin/;
 
@@ -31,13 +31,13 @@
 	fragment@2 {
 		target = <&sound>;
 		frag2: __overlay__ {
-			compatible = "boomberry,boomberry-dac";
+			compatible = "justboom,justboom-dac";
 			i2s-controller = <&i2s>;
 			status = "okay";
 		};
 	};
 
 	__overrides__ {
-		24db_digital_gain = <&frag2>,"boomberry,24db_digital_gain?";
+		24db_digital_gain = <&frag2>,"justboom,24db_digital_gain?";
 	};
 };

arch/arm/boot/dts/overlays/boomberry-digi-overlay.dts renamed to arch/arm/boot/dts/overlays/justboom-digi-overlay.dts

@@ -1,4 +1,4 @@
-// Definitions for BoomBerry Digi
+// Definitions for JustBoom Digi
 /dts-v1/;
 /plugin/;
 
@@ -31,7 +31,7 @@
 	fragment@2 {
 		target = <&sound>;
 		__overlay__ {
-			compatible = "boomberry,boomberry-digi";
+			compatible = "justboom,justboom-digi";
 			i2s-controller = <&i2s>;
 			status = "okay";
 		};

arch/arm/configs/bcm2709_defconfig

@@ -861,8 +861,8 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
 CONFIG_SND_BCM2708_SOC_RPI_DAC=m
 CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-CONFIG_SND_BCM2708_SOC_BOOMBERRY_DAC=m
-CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
 CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m

arch/arm/configs/bcmrpi_defconfig

@@ -853,8 +853,8 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
 CONFIG_SND_BCM2708_SOC_RPI_DAC=m
 CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-CONFIG_SND_BCM2708_SOC_BOOMBERRY_DAC=m
-CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
 CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
 CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
 CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m

sound/soc/bcm/Kconfig

@@ -50,19 +50,19 @@ config SND_BCM2708_SOC_RPI_PROTO
 	help
 	  Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731).
 
-config SND_BCM2708_SOC_BOOMBERRY_DAC
-	tristate "Support for BoomBerry DAC"
+config SND_BCM2708_SOC_JUSTBOOM_DAC
+	tristate "Support for JustBoom DAC"
 	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 	select SND_SOC_PCM512x
 	help
-	  Say Y or M if you want to add support for BoomBerry DAC.
+	  Say Y or M if you want to add support for JustBoom DAC.
 
-config SND_BCM2708_SOC_BOOMBERRY_DIGI
-	tristate "Support for BoomBerry Digi"
+config SND_BCM2708_SOC_JUSTBOOM_DIGI
+	tristate "Support for JustBoom Digi"
 	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 	select SND_SOC_WM8804
 	help
-	  Say Y or M if you want to add support for BoomBerry Digi.
+	  Say Y or M if you want to add support for JustBoom Digi.
 
 config SND_BCM2708_SOC_IQAUDIO_DAC
 	tristate "Support for IQaudIO-DAC"

sound/soc/bcm/Makefile

@@ -9,8 +9,8 @@ snd-soc-hifiberry-dac-objs := hifiberry_dac.o
 snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
 snd-soc-hifiberry-digi-objs := hifiberry_digi.o
 snd-soc-hifiberry-amp-objs := hifiberry_amp.o
-snd-soc-boomberry-dac-objs := boomberry-dac.o
-snd-soc-boomberry-digi-objs := boomberry-digi.o
+snd-soc-justboom-dac-objs := justboom-dac.o
+snd-soc-justboom-digi-objs := justboom-digi.o
 snd-soc-rpi-dac-objs := rpi-dac.o
 snd-soc-rpi-proto-objs := rpi-proto.o
 snd-soc-iqaudio-dac-objs := iqaudio-dac.o
@@ -23,8 +23,8 @@ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
 obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
 obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
 obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o
-obj-$(CONFIG_SND_BCM2708_SOC_BOOMBERRY_DAC) += snd-soc-boomberry-dac.o
-obj-$(CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI) += snd-soc-boomberry-digi.o
+obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC) += snd-soc-justboom-dac.o
+obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI) += snd-soc-justboom-digi.o
 obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
 obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
 obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o

sound/soc/bcm/boomberry-dac.c renamed to sound/soc/bcm/justboom-dac.c

@@ -1,5 +1,5 @@
 /*
- * ASoC Driver for BoomBerry DAC Raspberry Pi HAT Sound Card
+ * ASoC Driver for JustBoom DAC Raspberry Pi HAT Sound Card
  *
  * Author:	Milan Neskovic
  *		Copyright 2016
@@ -29,7 +29,7 @@
 
 static bool digital_gain_0db_limit = true;
 
-static int snd_rpi_boomberry_dac_init(struct snd_soc_pcm_runtime *rtd)
+static int snd_rpi_justboom_dac_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_codec *codec = rtd->codec;
 	snd_soc_update_bits(codec, PCM512x_GPIO_EN, 0x08, 0x08);
@@ -49,7 +49,7 @@ static int snd_rpi_boomberry_dac_init(struct snd_soc_pcm_runtime *rtd)
 	return 0;
 }
 
-static int snd_rpi_boomberry_dac_hw_params(struct snd_pcm_substream *substream,
+static int snd_rpi_justboom_dac_hw_params(struct snd_pcm_substream *substream,
 				       struct snd_pcm_hw_params *params)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -60,58 +60,58 @@ static int snd_rpi_boomberry_dac_hw_params(struct snd_pcm_substream *substream,
 	return snd_soc_dai_set_bclk_ratio(cpu_dai, sample_bits * 2);
 }
 
-static int snd_rpi_boomberry_dac_startup(struct snd_pcm_substream *substream) {
+static int snd_rpi_justboom_dac_startup(struct snd_pcm_substream *substream) {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_codec *codec = rtd->codec;
 	snd_soc_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08,0x08);
 	return 0;
 }
 
-static void snd_rpi_boomberry_dac_shutdown(struct snd_pcm_substream *substream) {
+static void snd_rpi_justboom_dac_shutdown(struct snd_pcm_substream *substream) {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_codec *codec = rtd->codec;
 	snd_soc_update_bits(codec, PCM512x_GPIO_CONTROL_1, 0x08,0x00);
 }
 
 /* machine stream operations */
-static struct snd_soc_ops snd_rpi_boomberry_dac_ops = {
-	.hw_params = snd_rpi_boomberry_dac_hw_params,
-	.startup = snd_rpi_boomberry_dac_startup,
-	.shutdown = snd_rpi_boomberry_dac_shutdown,
+static struct snd_soc_ops snd_rpi_justboom_dac_ops = {
+	.hw_params = snd_rpi_justboom_dac_hw_params,
+	.startup = snd_rpi_justboom_dac_startup,
+	.shutdown = snd_rpi_justboom_dac_shutdown,
 };
 
-static struct snd_soc_dai_link snd_rpi_boomberry_dac_dai[] = {
+static struct snd_soc_dai_link snd_rpi_justboom_dac_dai[] = {
 {
-	.name		= "BoomBerry DAC",
-	.stream_name	= "BoomBerry DAC HiFi",
+	.name		= "JustBoom DAC",
+	.stream_name	= "JustBoom DAC HiFi",
 	.cpu_dai_name	= "bcm2708-i2s.0",
 	.codec_dai_name	= "pcm512x-hifi",
 	.platform_name	= "bcm2708-i2s.0",
 	.codec_name	= "pcm512x.1-004d",
 	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
 				SND_SOC_DAIFMT_CBS_CFS,
-	.ops		= &snd_rpi_boomberry_dac_ops,
-	.init		= snd_rpi_boomberry_dac_init,
+	.ops		= &snd_rpi_justboom_dac_ops,
+	.init		= snd_rpi_justboom_dac_init,
 },
 };
 
 /* audio machine driver */
-static struct snd_soc_card snd_rpi_boomberry_dac = {
-	.name         = "snd_rpi_boomberry_dac",
+static struct snd_soc_card snd_rpi_justboom_dac = {
+	.name         = "snd_rpi_justboom_dac",
 	.owner        = THIS_MODULE,
-	.dai_link     = snd_rpi_boomberry_dac_dai,
-	.num_links    = ARRAY_SIZE(snd_rpi_boomberry_dac_dai),
+	.dai_link     = snd_rpi_justboom_dac_dai,
+	.num_links    = ARRAY_SIZE(snd_rpi_justboom_dac_dai),
 };
 
-static int snd_rpi_boomberry_dac_probe(struct platform_device *pdev)
+static int snd_rpi_justboom_dac_probe(struct platform_device *pdev)
 {
 	int ret = 0;
 
-	snd_rpi_boomberry_dac.dev = &pdev->dev;
+	snd_rpi_justboom_dac.dev = &pdev->dev;
 
 	if (pdev->dev.of_node) {
 	    struct device_node *i2s_node;
-	    struct snd_soc_dai_link *dai = &snd_rpi_boomberry_dac_dai[0];
+	    struct snd_soc_dai_link *dai = &snd_rpi_justboom_dac_dai[0];
 	    i2s_node = of_parse_phandle(pdev->dev.of_node,
 					"i2s-controller", 0);
 
@@ -123,40 +123,40 @@ static int snd_rpi_boomberry_dac_probe(struct platform_device *pdev)
 	    }
 
 	    digital_gain_0db_limit = !of_property_read_bool(
-			pdev->dev.of_node, "boomberry,24db_digital_gain");
+			pdev->dev.of_node, "justboom,24db_digital_gain");
 	}
 
-	ret = snd_soc_register_card(&snd_rpi_boomberry_dac);
+	ret = snd_soc_register_card(&snd_rpi_justboom_dac);
 	if (ret)
 		dev_err(&pdev->dev,
 			"snd_soc_register_card() failed: %d\n", ret);
 
 	return ret;
 }
 
-static int snd_rpi_boomberry_dac_remove(struct platform_device *pdev)
+static int snd_rpi_justboom_dac_remove(struct platform_device *pdev)
 {
-	return snd_soc_unregister_card(&snd_rpi_boomberry_dac);
+	return snd_soc_unregister_card(&snd_rpi_justboom_dac);
 }
 
-static const struct of_device_id snd_rpi_boomberry_dac_of_match[] = {
-	{ .compatible = "boomberry,boomberry-dac", },
+static const struct of_device_id snd_rpi_justboom_dac_of_match[] = {
+	{ .compatible = "justboom,justboom-dac", },
 	{},
 };
-MODULE_DEVICE_TABLE(of, snd_rpi_boomberry_dac_of_match);
+MODULE_DEVICE_TABLE(of, snd_rpi_justboom_dac_of_match);
 
-static struct platform_driver snd_rpi_boomberry_dac_driver = {
+static struct platform_driver snd_rpi_justboom_dac_driver = {
 	.driver = {
-		.name   = "snd-rpi-boomberry-dac",
+		.name   = "snd-rpi-justboom-dac",
 		.owner  = THIS_MODULE,
-		.of_match_table = snd_rpi_boomberry_dac_of_match,
+		.of_match_table = snd_rpi_justboom_dac_of_match,
 	},
-	.probe          = snd_rpi_boomberry_dac_probe,
-	.remove         = snd_rpi_boomberry_dac_remove,
+	.probe          = snd_rpi_justboom_dac_probe,
+	.remove         = snd_rpi_justboom_dac_remove,
 };
 
-module_platform_driver(snd_rpi_boomberry_dac_driver);
+module_platform_driver(snd_rpi_justboom_dac_driver);
 
-MODULE_AUTHOR("Milan Neskovic <info@boomberry.co>");
-MODULE_DESCRIPTION("ASoC Driver for BoomBerry PI DAC HAT Sound Card");
+MODULE_AUTHOR("Milan Neskovic <info@justboom.co>");
+MODULE_DESCRIPTION("ASoC Driver for JustBoom PI DAC HAT Sound Card");
 MODULE_LICENSE("GPL v2");