Platform nodes getting named incorrectly on upstream kernel 3.10.67

I am using kernel 3.10.67 to boot android and ubuntu on jetson-tk1 and I noticed that a lot has changed in the board-ardbeg.c file pertaining to tegra114, most definitions have changed up to tegra124. This seems to effect the DTB and incorrect nodes are created. I am not sure how to resolve this so if someone can point me in the right direction I would be immensely grateful.

Here is how my /sys/device/platform looks on 3.10.67:

Incorrectly Named Nodes

ls /sys/devices/platform/
1003000.pcie-controller
50041000.interrupt-controller
60004000.interrupt-controller
60005000.timer
60005100.watchdog
60006000.clock
6000d000.gpio
60020000.dma
70000868.pinmux
70006000.serial
70006040.serial
70006200.serial
70006300.serial
7000a000.pwm
7000c000.i2c
7000c400.i2c
7000c500.i2c
7000c700.i2c
7000d000.i2c
7000d100.i2c
7000d400.spi
7000da00.spi
7000e000.rtc
7000e400.pmc
70015000.tegra_cec
70019000.iommu
70019000.mc
70021000.sata
700e2000.soctherm
700e3000.mipical

Normal nodes:

700e3000.mipical
alarmtimer
arm-pmu.23
bcm4329_wlan.1
bthrot_cdev.28
clocks.18
cpu_edp.26
disa-pd.12
disb-pd.13
dtv
fiq_debugger.25
gk20a.0
gpio-keys.29
gpu-pd.6
gpu_edp.20
host1x
host1x-pd.2
mc-clk-pd.0
mrvl_wlan.1
msenc-pd.5
nvavp-pd.1
pcie-pd.9
pcl-generic
power
power-detect.24
psci.19
ptm
pwm-backlight
reg-dummy
regulators.30
sata-pd.10
sdhci-tegra.0
sdhci-tegra.2
sdhci-tegra.3
serial8250
snd-soc-dummy
soc-camera-pdrv.0
sor-pd.11
spdif-dit.0
spdif-dit.1
spdif-dit.2
tegra-camera-platform.31
tegra-carveouts.17
tegra-ehci.1
tegra-ehci.2
tegra-fuse
tegra-offload
tegra-otg
tegra-snd-rt5639.0
tegra-udc.0
tegra-xhci
tegra12-se
tegra30-ahub
tegra30-avp-audio
tegra30-dam.0
tegra30-dam.1
tegra30-dam.2
tegra30-hda
tegra30-i2s.0
tegra30-i2s.1
tegra30-i2s.3
tegra30-i2s.4
tegra30-spdif
tegra_rtc
therm_est_sensor.27
timer.21
tlk.22
tsec-pd.3
uevent
vde-pd.8
ve-pd.7
vic03-pd.4
xusba-pd.14
xusbb-pd.15
xusbc-pd.16

Hello,
For TK1 Android, please take a look @ https://devtalk.nvidia.com/default/topic/878820/jetson-tk1/android-l-update-to-jetson-tk1/

br
ChenJian

Yes I have had a look at the official instructions, thanks. I am just tinkering with the upstream kernel…

I have seen on Google’s Pixel C (which uses tegra x1) it has similar node names…

So this is not an error it is normal but the device tree dtb needs some work…