move jetson-nano to media

config/boards/jetson-nano.conf

@@ -1,7 +1,7 @@
 # Nvidia Jetson Nano quad core 2G/4GB SoC 4 x USB3 HDMI & DP
 BOARD_NAME="Jetson Nano"
-BOARDFAMILY="jetson-nano"
-BOOTCONFIG="p3450-0000_defconfig"
+BOARDFAMILY="media"
+BOOTCONFIG="none"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/sources/families/include/rockchip64_common.inc

@@ -319,6 +319,22 @@ family_tweaks() {
 
 	fi
 
+	if [[ $BOARD == jetson-nano ]]; then
+		install -m 755 $SRC/packages/blobs/jetson/jetson.sh $SDCARD/etc/initramfs-tools/hooks/jetson.sh
+		if [[ $BRANCH == legacy ]]; then
+			install -m 755 $SRC/packages/blobs/jetson/tegra21x_xusb_firmware $SDCARD/lib/firmware/tegra21x_xusb_firmware
+			install -m 755 $SRC/packages/blobs/jetson/asound.conf.tegrahda $SDCARD/etc/asound.conf.tegrahda
+			install -m 755 $SRC/packages/blobs/jetson/asound.conf.tegrahda $SDCARD/etc/asound.conf
+			install -m 755 $SRC/packages/blobs/jetson/asound.conf.tegrasndt210ref $SDCARD/etc/asound.conf.tegrasndt210ref
+			install -m 755 $SRC/packages/blobs/jetson/tegra-hda.conf $SDCARD/usr/share/alsa/cards/tegra-hda.conf
+			install -m 755 $SRC/packages/blobs/jetson/tegra-snd-t210r.conf $SDCARD/usr/share/alsa/cards/tegra-snd-t210r.conf
+			sed -e 's/exit 0//g' -i $SDCARD/etc/rc.local
+			echo "su -c 'echo 255 > /sys/devices/pwm-fan/target_pwm'" >> $SDCARD/etc/rc.local
+			echo "exit 0" >> $SDCARD/etc/rc.local
+		else
+			cp -R $SRC/packages/blobs/jetson/firmware/* $SDCARD/lib/firmware/
+		fi
+    	fi
 }
 
 family_tweaks_bsp() {

config/sources/families/media.conf

@@ -26,6 +26,14 @@ case $BRANCH in
 			LINUXCONFIG='linux-station-p2-'$BRANCH
 			EXTRAWIFI="no"
 			WIREGUARD="no"
+		elif [[ $BOARD == jetson-nano ]]; then
+			KERNELDIR='linux-nano'
+			KERNELSOURCE='https://github.com/150balbes/Jetson-Nano'
+			KERNELBRANCH='branch:4.9.201'
+			EXTRAWIFI="no"
+			BOOT_FDT_FILE="none"
+			SRC_CMDLINE='console=ttyS0,115200n8 console=tty0 tegraid=21.1.2.0.0 ddr_die=4096M@2048M section=512M memtype=0 vpr_resize usb_port_owner_info=0 lane_owner_info=0 emc_max_dvfs=0 touch_id=0@63 video=tegrafb debug_uartport=lsport,4 earlyprintk=uart8250-32bit,0x70006000 maxcpus=4 usbcore.old_scheme_first=1 lp0_vec=0x1000@0xff780000 core_edp_mv=1075 core_edp_ma=4000 tegra_fbmem=0x800000@0x92ca9000 is_hdmi_initialised=1 earlycon=uart8250,mmio32,0x70006000 fbcon=map:0'
+			MODULES_INITRD="jetson-nano-legacy"
 		else
 			if [[ $BOARD == nanopct4 ]]; then
 				KERNELSOURCE='https://github.com/friendlyarm/kernel-rockchip'
@@ -60,7 +68,7 @@ case $BRANCH in
 
 	edge)
 		KERNELPATCHDIR='media-'$BRANCH
-		KERNELBRANCH="tag:v5.19-rc6"
+		KERNELBRANCH="tag:v5.19-rc7"
 		LINUXFAMILY=media
 		LINUXCONFIG='linux-media-'$BRANCH
 		SKIP_BOOTSPLASH="yes"

patch/kernel/archive/media-5.19/990-sound-rk.patch

@@ -0,0 +1,269 @@
+--- a/sound/soc/rockchip/rockchip_i2s.c
++++ b/sound/soc/rockchip/rockchip_i2s.c
+@@ -13,7 +13,6 @@
+ #include <linux/of_gpio.h>
+ #include <linux/of_device.h>
+ #include <linux/clk.h>
+-#include <linux/pinctrl/consumer.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/regmap.h>
+ #include <linux/spinlock.h>
+@@ -55,39 +54,7 @@
+ 	const struct rk_i2s_pins *pins;
+ 	unsigned int bclk_ratio;
+ 	spinlock_t lock; /* tx/rx lock */
+-	struct pinctrl *pinctrl;
+-	struct pinctrl_state *bclk_on;
+-	struct pinctrl_state *bclk_off;
+-};
+-
+-static int i2s_pinctrl_select_bclk_on(struct rk_i2s_dev *i2s)
+-{
+-	int ret = 0;
+-
+-	if (!IS_ERR(i2s->pinctrl) && !IS_ERR_OR_NULL(i2s->bclk_on))
+-		ret = pinctrl_select_state(i2s->pinctrl,
+-				     i2s->bclk_on);
+-
+-	if (ret)
+-		dev_err(i2s->dev, "bclk enable failed %d\n", ret);
+-
+-	return ret;
+-}
+-
+-static int i2s_pinctrl_select_bclk_off(struct rk_i2s_dev *i2s)
+-{
+-
+-	int ret = 0;
+-
+-	if (!IS_ERR(i2s->pinctrl) && !IS_ERR_OR_NULL(i2s->bclk_off))
+-		ret = pinctrl_select_state(i2s->pinctrl,
+-				     i2s->bclk_off);
+-
+-	if (ret)
+-		dev_err(i2s->dev, "bclk disable failed %d\n", ret);
+-
+-	return ret;
+-}
++};
+
+ static int i2s_runtime_suspend(struct device *dev)
+ {
+@@ -125,49 +92,38 @@
+ 	return snd_soc_dai_get_drvdata(dai);
+ }
+
+-static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
++static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
+ {
+ 	unsigned int val = 0;
+ 	int retry = 10;
+-	int ret = 0;
+
+ 	spin_lock(&i2s->lock);
+ 	if (on) {
+-		ret = regmap_update_bits(i2s->regmap, I2S_DMACR,
+-				I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE);
+-		if (ret < 0)
+-			goto end;
+-
+-		ret = regmap_update_bits(i2s->regmap, I2S_XFER,
+-				I2S_XFER_TXS_START | I2S_XFER_RXS_START,
+-				I2S_XFER_TXS_START | I2S_XFER_RXS_START);
+-		if (ret < 0)
+-			goto end;
++		regmap_update_bits(i2s->regmap, I2S_DMACR,
++				   I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE);
++
++		regmap_update_bits(i2s->regmap, I2S_XFER,
++				   I2S_XFER_TXS_START | I2S_XFER_RXS_START,
++				   I2S_XFER_TXS_START | I2S_XFER_RXS_START);
+
+ 		i2s->tx_start = true;
+ 	} else {
+ 		i2s->tx_start = false;
+
+-		ret = regmap_update_bits(i2s->regmap, I2S_DMACR,
+-				I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);
+-		if (ret < 0)
+-			goto end;
++		regmap_update_bits(i2s->regmap, I2S_DMACR,
++				   I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);
+
+ 		if (!i2s->rx_start) {
+-			ret = regmap_update_bits(i2s->regmap, I2S_XFER,
+-					I2S_XFER_TXS_START |
+-					I2S_XFER_RXS_START,
+-					I2S_XFER_TXS_STOP |
+-					I2S_XFER_RXS_STOP);
+-			if (ret < 0)
+-				goto end;
++			regmap_update_bits(i2s->regmap, I2S_XFER,
++					   I2S_XFER_TXS_START |
++					   I2S_XFER_RXS_START,
++					   I2S_XFER_TXS_STOP |
++					   I2S_XFER_RXS_STOP);
+
+ 			udelay(150);
+-			ret = regmap_update_bits(i2s->regmap, I2S_CLR,
+-					I2S_CLR_TXC | I2S_CLR_RXC,
+-					I2S_CLR_TXC | I2S_CLR_RXC);
+-			if (ret < 0)
+-				goto end;
++			regmap_update_bits(i2s->regmap, I2S_CLR,
++					   I2S_CLR_TXC | I2S_CLR_RXC,
++					   I2S_CLR_TXC | I2S_CLR_RXC);
+
+ 			regmap_read(i2s->regmap, I2S_CLR, &val);
+
+@@ -182,57 +138,44 @@
+ 			}
+ 		}
+ 	}
+-end:
+ 	spin_unlock(&i2s->lock);
+-	if (ret < 0)
+-		dev_err(i2s->dev, "lrclk update failed\n");
+-
+-	return ret;
+-}
+-
+-static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)
++}
++
++static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)
+ {
+ 	unsigned int val = 0;
+ 	int retry = 10;
+-	int ret = 0;
+
+ 	spin_lock(&i2s->lock);
+ 	if (on) {
+-		ret = regmap_update_bits(i2s->regmap, I2S_DMACR,
++		regmap_update_bits(i2s->regmap, I2S_DMACR,
+ 				   I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE);
+-		if (ret < 0)
+-			goto end;
+-
+-		ret = regmap_update_bits(i2s->regmap, I2S_XFER,
++
++		regmap_update_bits(i2s->regmap, I2S_XFER,
+ 				   I2S_XFER_TXS_START | I2S_XFER_RXS_START,
+ 				   I2S_XFER_TXS_START | I2S_XFER_RXS_START);
+-		if (ret < 0)
+-			goto end;
+
+ 		i2s->rx_start = true;
+ 	} else {
+ 		i2s->rx_start = false;
+
+-		ret = regmap_update_bits(i2s->regmap, I2S_DMACR,
++		regmap_update_bits(i2s->regmap, I2S_DMACR,
+ 				   I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE);
+-		if (ret < 0)
+-			goto end;
+
+ 		if (!i2s->tx_start) {
+-			ret = regmap_update_bits(i2s->regmap, I2S_XFER,
++			regmap_update_bits(i2s->regmap, I2S_XFER,
+ 					   I2S_XFER_TXS_START |
+ 					   I2S_XFER_RXS_START,
+ 					   I2S_XFER_TXS_STOP |
+ 					   I2S_XFER_RXS_STOP);
+-			if (ret < 0)
+-				goto end;
++
+ 			udelay(150);
+-			ret = regmap_update_bits(i2s->regmap, I2S_CLR,
++			regmap_update_bits(i2s->regmap, I2S_CLR,
+ 					   I2S_CLR_TXC | I2S_CLR_RXC,
+ 					   I2S_CLR_TXC | I2S_CLR_RXC);
+-			if (ret < 0)
+-				goto end;
++
+ 			regmap_read(i2s->regmap, I2S_CLR, &val);
++
+ 			/* Should wait for clear operation to finish */
+ 			while (val) {
+ 				regmap_read(i2s->regmap, I2S_CLR, &val);
+@@ -244,12 +187,7 @@
+ 			}
+ 		}
+ 	}
+-end:
+ 	spin_unlock(&i2s->lock);
+-	if (ret < 0)
+-		dev_err(i2s->dev, "lrclk update failed\n");
+-
+-	return ret;
+ }
+
+ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
+@@ -487,26 +425,17 @@
+ 	case SNDRV_PCM_TRIGGER_RESUME:
+ 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ 		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+-			ret = rockchip_snd_rxctrl(i2s, 1);
++			rockchip_snd_rxctrl(i2s, 1);
+ 		else
+-			ret = rockchip_snd_txctrl(i2s, 1);
+-		/* Do not turn on bclk if lrclk open fails. */
+-		if (ret < 0)
+-			return ret;
+-		i2s_pinctrl_select_bclk_on(i2s);
++			rockchip_snd_txctrl(i2s, 1);
+ 		break;
+ 	case SNDRV_PCM_TRIGGER_SUSPEND:
+ 	case SNDRV_PCM_TRIGGER_STOP:
+ 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+-		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
+-			if (!i2s->tx_start)
+-				i2s_pinctrl_select_bclk_off(i2s);
+-			ret = rockchip_snd_rxctrl(i2s, 0);
+-		} else {
+-			if (!i2s->rx_start)
+-				i2s_pinctrl_select_bclk_off(i2s);
+-			ret = rockchip_snd_txctrl(i2s, 0);
+-		}
++		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
++			rockchip_snd_rxctrl(i2s, 0);
++		else
++			rockchip_snd_txctrl(i2s, 0);
+ 		break;
+ 	default:
+ 		ret = -EINVAL;
+@@ -807,33 +736,6 @@
+ 	}
+
+ 	i2s->bclk_ratio = 64;
+-	i2s->pinctrl = devm_pinctrl_get(&pdev->dev);
+-	if (IS_ERR(i2s->pinctrl))
+-		dev_err(&pdev->dev, "failed to find i2s pinctrl\n");
+-
+-	i2s->bclk_on = pinctrl_lookup_state(i2s->pinctrl,
+-				   "bclk_on");
+-	if (IS_ERR_OR_NULL(i2s->bclk_on))
+-		dev_err(&pdev->dev, "failed to find i2s default state\n");
+-	else
+-		dev_dbg(&pdev->dev, "find i2s bclk state\n");
+-
+-	i2s->bclk_off = pinctrl_lookup_state(i2s->pinctrl,
+-				  "bclk_off");
+-	if (IS_ERR_OR_NULL(i2s->bclk_off))
+-		dev_err(&pdev->dev, "failed to find i2s gpio state\n");
+-	else
+-		dev_dbg(&pdev->dev, "find i2s bclk_off state\n");
+-
+-	i2s_pinctrl_select_bclk_off(i2s);
+-
+-	i2s->playback_dma_data.addr = res->start + I2S_TXDR;
+-	i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+-	i2s->playback_dma_data.maxburst = 4;
+-
+-	i2s->capture_dma_data.addr = res->start + I2S_RXDR;
+-	i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+-	i2s->capture_dma_data.maxburst = 4;
+
+ 	dev_set_drvdata(&pdev->dev, i2s);
+
+